Some whitespace fixes.

diff --git a/src/libstrongswan/credentials/certificates/x509.h b/src/libstrongswan/credentials/certificates/x509.h
index fec02dbadfc9e8092ea964367dda89d041332470..ba3766b1fa93c8c70536410babdb27238407543d 100644 (file)
--- a/src/libstrongswan/credentials/certificates/x509.h
+++ b/src/libstrongswan/credentials/certificates/x509.h
@@ -41,13 +41,13 @@ enum x509_flag_t {
        /** cert has no constraints */
        X509_NONE =                             0,
        /** cert has CA constraint */
-       X509_CA =                               (1<<0),
+       X509_CA =                               (1<<0),
        /** cert has AA constraint */
-       X509_AA =                               (1<<1),
+       X509_AA =                               (1<<1),
        /** cert has OCSP signer constraint */
-       X509_OCSP_SIGNER =              (1<<2),
+       X509_OCSP_SIGNER =              (1<<2),
        /** cert has serverAuth key usage */
-       X509_SERVER_AUTH =              (1<<3),
+       X509_SERVER_AUTH =              (1<<3),
        /** cert has clientAuth key usage */
        X509_CLIENT_AUTH =              (1<<4),
        /** cert is self-signed */

diff --git a/src/libstrongswan/plugins/x509/x509_cert.c b/src/libstrongswan/plugins/x509/x509_cert.c
index 8b228a2b660b134ee3b9606ec9af4cf33e8e4643..6db2e6869e3087032cb47c7371e0ccd7ec720bd0 100644 (file)
--- a/src/libstrongswan/plugins/x509/x509_cert.c
+++ b/src/libstrongswan/plugins/x509/x509_cert.c
@@ -275,8 +275,8 @@ static const asn1Object_t basicConstraintsObjects[] = {
        { 0, "basicConstraints",        ASN1_SEQUENCE,  ASN1_NONE                       }, /*  0 */
        { 1,   "CA",                            ASN1_BOOLEAN,   ASN1_DEF|ASN1_BODY      }, /*  1 */
        { 1,   "pathLenConstraint",     ASN1_INTEGER,   ASN1_OPT|ASN1_BODY      }, /*  2 */
-       { 1,   "end opt",                       ASN1_EOC,               ASN1_END                        }, /*  3 */
-       { 0, "exit",                            ASN1_EOC,               ASN1_EXIT                       }
+       { 1,   "end opt",                       ASN1_EOC,               ASN1_END                        }, /*  3 */
+       { 0, "exit",                            ASN1_EOC,               ASN1_EXIT                       }
 };
 #define BASIC_CONSTRAINTS_CA           1
 #define BASIC_CONSTRAINTS_PATH_LEN     2
@@ -394,7 +394,7 @@ static const asn1Object_t generalNameObjects[] = {
        { 0, "otherName",               ASN1_CONTEXT_C_0,  ASN1_OPT|ASN1_BODY   }, /*  0 */
        { 0, "end choice",              ASN1_EOC,          ASN1_END                             }, /*  1 */
        { 0, "rfc822Name",              ASN1_CONTEXT_S_1,  ASN1_OPT|ASN1_BODY   }, /*  2 */
-       { 0, "end choice",              ASN1_EOC,          ASN1_END                     }, /*  3 */
+       { 0, "end choice",              ASN1_EOC,          ASN1_END                             }, /*  3 */
        { 0, "dnsName",                 ASN1_CONTEXT_S_2,  ASN1_OPT|ASN1_BODY   }, /*  4 */
        { 0, "end choice",              ASN1_EOC,          ASN1_END                             }, /*  5 */
        { 0, "x400Address",             ASN1_CONTEXT_S_3,  ASN1_OPT|ASN1_BODY   }, /*  6 */
@@ -536,14 +536,14 @@ void x509_parse_generalNames(chunk_t blob, int level0, bool implicit, linked_lis
  * ASN.1 definition of a authorityKeyIdentifier extension
  */
 static const asn1Object_t authKeyIdentifierObjects[] = {
-       { 0, "authorityKeyIdentifier",          ASN1_SEQUENCE,          ASN1_NONE                       }, /* 0 */
+       { 0, "authorityKeyIdentifier",          ASN1_SEQUENCE,          ASN1_NONE                       }, /* 0 */
        { 1,   "keyIdentifier",                         ASN1_CONTEXT_S_0,       ASN1_OPT|ASN1_BODY      }, /* 1 */
-       { 1,   "end opt",                                       ASN1_EOC,                       ASN1_END                        }, /* 2 */
+       { 1,   "end opt",                                       ASN1_EOC,                       ASN1_END                        }, /* 2 */
        { 1,   "authorityCertIssuer",           ASN1_CONTEXT_C_1,       ASN1_OPT|ASN1_OBJ       }, /* 3 */
-       { 1,   "end opt",                                       ASN1_EOC,                       ASN1_END                        }, /* 4 */
+       { 1,   "end opt",                                       ASN1_EOC,                       ASN1_END                        }, /* 4 */
        { 1,   "authorityCertSerialNumber",     ASN1_CONTEXT_S_2,       ASN1_OPT|ASN1_BODY      }, /* 5 */
-       { 1,   "end opt",                                       ASN1_EOC,                       ASN1_END                        }, /* 6 */
-       { 0, "exit",                                            ASN1_EOC,                       ASN1_EXIT                       }
+       { 1,   "end opt",                                       ASN1_EOC,                       ASN1_END                        }, /* 6 */
+       { 0, "exit",                                            ASN1_EOC,                       ASN1_EXIT                       }
 };
 #define AUTH_KEY_ID_KEY_ID                     1
 #define AUTH_KEY_ID_CERT_ISSUER                3
@@ -1105,19 +1105,19 @@ static void parse_policyConstraints(chunk_t blob, int level0,
  * ASN.1 definition of ipAddrBlocks according to RFC 3779
  */
 static const asn1Object_t ipAddrBlocksObjects[] = {
-       { 0, "ipAddrBlocks",            ASN1_SEQUENCE,          ASN1_LOOP                       }, /*  0 */
+       { 0, "ipAddrBlocks",                    ASN1_SEQUENCE,          ASN1_LOOP                       }, /*  0 */
        { 1,   "ipAddressFamily",               ASN1_SEQUENCE,          ASN1_NONE                       }, /*  1 */
-       { 2,     "addressFamily",           ASN1_OCTET_STRING,  ASN1_BODY               }, /*  2 */
-       { 2,     "inherit",             ASN1_NULL,          ASN1_OPT|ASN1_NONE  }, /*  3 */
-       { 2,     "end choice",          ASN1_EOC,           ASN1_END            }, /*  4 */
-       { 2,     "addressesOrRanges",   ASN1_SEQUENCE,      ASN1_OPT|ASN1_LOOP  }, /*  5 */
-       { 3,       "addressPrefix",         ASN1_BIT_STRING,    ASN1_OPT|ASN1_BODY  }, /*  6 */
-       { 3,       "end choice",        ASN1_EOC,           ASN1_END            }, /*  7 */
-       { 3,       "addressRange",      ASN1_SEQUENCE,      ASN1_OPT|ASN1_NONE  }, /*  8 */
-       { 4,         "min",             ASN1_BIT_STRING,    ASN1_BODY           }, /*  9 */
-       { 4,         "max",             ASN1_BIT_STRING,    ASN1_BODY           }, /* 10 */
-       { 3,       "end choice",        ASN1_EOC,           ASN1_END            }, /* 11 */
-       { 2,     "end opt/loop",        ASN1_EOC,           ASN1_END            }, /* 12 */
+       { 2,     "addressFamily",               ASN1_OCTET_STRING,      ASN1_BODY                       }, /*  2 */
+       { 2,     "inherit",                             ASN1_NULL,                      ASN1_OPT|ASN1_NONE      }, /*  3 */
+       { 2,     "end choice",                  ASN1_EOC,                       ASN1_END                        }, /*  4 */
+       { 2,     "addressesOrRanges",   ASN1_SEQUENCE,          ASN1_OPT|ASN1_LOOP      }, /*  5 */
+       { 3,       "addressPrefix",             ASN1_BIT_STRING,        ASN1_OPT|ASN1_BODY  }, /*  6 */
+       { 3,       "end choice",                ASN1_EOC,                       ASN1_END                        }, /*  7 */
+       { 3,       "addressRange",              ASN1_SEQUENCE,          ASN1_OPT|ASN1_NONE      }, /*  8 */
+       { 4,         "min",                             ASN1_BIT_STRING,        ASN1_BODY                       }, /*  9 */
+       { 4,         "max",                             ASN1_BIT_STRING,        ASN1_BODY                       }, /* 10 */
+       { 3,       "end choice",                ASN1_EOC,                       ASN1_END                        }, /* 11 */
+       { 2,     "end opt/loop",                ASN1_EOC,                       ASN1_END                        }, /* 12 */
        { 0, "end loop",                                ASN1_EOC,                       ASN1_END                        }, /* 13 */
        { 0, "exit",                                    ASN1_EOC,                       ASN1_EXIT                       }
 };
@@ -1280,7 +1280,7 @@ static const asn1Object_t certObjects[] = {
 #define X509_OBJ_VERSION                                                3
 #define X509_OBJ_SERIAL_NUMBER                                  4
 #define X509_OBJ_SIG_ALG                                                5
-#define X509_OBJ_ISSUER                                                 6
+#define X509_OBJ_ISSUER                                                         6
 #define X509_OBJ_NOT_BEFORE                                             8
 #define X509_OBJ_NOT_AFTER                                              9
 #define X509_OBJ_SUBJECT                                               10
@@ -1706,7 +1706,7 @@ METHOD(x509_t, get_subjectKeyIdentifier, chunk_t,
                chunk_t fingerprint;
 
                if (this->public_key->get_fingerprint(this->public_key,
-                                                                       KEYID_PUBKEY_SHA1, &fingerprint))
+                                                                       KEYID_PUBKEY_SHA1, &fingerprint))
                {
                        return fingerprint;
                }