From 63b86f5641e4dff904d33411ec11e933916368e7 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 16 Jun 2006 05:51:16 +0000
Subject: [PATCH] cosmetics

---
 src/libstrongswan/crypto/x509.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/libstrongswan/crypto/x509.c b/src/libstrongswan/crypto/x509.c
index 54a6395..905fc4c 100755
--- a/src/libstrongswan/crypto/x509.c
+++ b/src/libstrongswan/crypto/x509.c
@@ -79,6 +79,11 @@ struct private_x509_t {
 	chunk_t certificate;
 
 	/**
+	 * X.509 certificate body over which signature is computed
+	 */
+	chunk_t tbsCertificate;
+
+	/**
 	 * Version of the X.509 certificate
 	 */
 	u_int version;
@@ -89,6 +94,11 @@ struct private_x509_t {
 	chunk_t serialNumber;
 
 	/**
+	 * Signature algorithm
+	 */
+	int sigAlg;
+	
+	/**
 	 * ID representing the certificate issuer
 	 */
 	identification_t *issuer;
@@ -143,16 +153,20 @@ struct private_x509_t {
 	 */
 	bool isCA;
 
+	/**
+	 * Signature algorithm (must be identical to sigAlg)
+	 */
+	int algorithm;
+
+	/**
+	 * Signature
+	 */
+	chunk_t signature;
+
 	u_char authority_flags;
-	chunk_t tbsCertificate;
-	/*   signature */
-	int sigAlg;
 	chunk_t subjectPublicKey;
 	bool isOcspSigner; /* ocsp */
 	chunk_t accessLocation; /* ocsp */
-	/* signatureAlgorithm */
-	int algorithm;
-	chunk_t signature;
 };
 
 /**
@@ -527,7 +541,7 @@ static void parse_generalNames(chunk_t blob, int level0, bool implicit, linked_l
 			identification_t *gn = parse_generalName(object, level+1);
 
 			if (gn != NULL)
-				list->insert_last(list, gn);
+				list->insert_last(list, (void *)gn);
 		}
 		objectID++;
 	}
-- 
2.7.4