1 files changed, 33 insertions, 68 deletions

diff --git a/src/lib/libcrypto/asn1/t_x509.c b/src/lib/libcrypto/asn1/t_x509.c
index 30d49cc4dd..32f1a4f4b0 100644
--- a/src/lib/libcrypto/asn1/t_x509.c
+++ b/src/lib/libcrypto/asn1/t_x509.c
@@ -85,8 +85,7 @@ int X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag, unsigned long cfla
         BIO *b;
         int ret;
 
-        if ((b=BIO_new(BIO_s_file())) == NULL)
-        {
+        if ((b=BIO_new(BIO_s_file())) == NULL) {
                 X509err(X509_F_X509_PRINT_EX_FP,ERR_R_BUF_LIB);
                 return(0);
         }
@@ -122,42 +121,33 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
                 nmindent = 16;
 
         ci=x->cert_info;
-        if(!(cflag & X509_FLAG_NO_HEADER))
-        {
+        if(!(cflag & X509_FLAG_NO_HEADER)) {
                 if (BIO_write(bp,"Certificate:\n",13) <= 0) goto err;
                 if (BIO_write(bp,"    Data:\n",10) <= 0) goto err;
         }
-        if(!(cflag & X509_FLAG_NO_VERSION))
-        {
+        if(!(cflag & X509_FLAG_NO_VERSION)) {
                 l=X509_get_version(x);
                 if (BIO_printf(bp,"%8sVersion: %lu (0x%lx)\n","",l+1,l) <= 0) goto err;
         }
-        if(!(cflag & X509_FLAG_NO_SERIAL))
-        {
+        if(!(cflag & X509_FLAG_NO_SERIAL)) {
 
                 if (BIO_write(bp,"        Serial Number:",22) <= 0) goto err;
 
                 bs=X509_get_serialNumber(x);
-                if (bs->length <= (int)sizeof(long))
-                {
+                if (bs->length <= (int)sizeof(long)) {
                         l=ASN1_INTEGER_get(bs);
-                        if (bs->type == V_ASN1_NEG_INTEGER)
-                        {
+                        if (bs->type == V_ASN1_NEG_INTEGER) {
                                 l= -l;
                                 neg="-";
-                        }
-                        else
+                        } else
                                 neg="";
                         if (BIO_printf(bp," %s%lu (%s0x%lx)\n",neg,l,neg,l) <= 0)
                                 goto err;
-                }
-                else
-                {
+                } else {
                         neg=(bs->type == V_ASN1_NEG_INTEGER)?" (Negative)":"";
                         if (BIO_printf(bp,"\n%12s%s","",neg) <= 0) goto err;
 
-                        for (i=0; i<bs->length; i++)
-                        {
+                        for (i=0; i<bs->length; i++) {
                                 if (BIO_printf(bp,"%02x%c",bs->data[i],
                                         ((i+1 == bs->length)?'\n':':')) <= 0)
                                         goto err;
@@ -166,8 +156,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
 
         }
 
-        if(!(cflag & X509_FLAG_NO_SIGNAME))
-        {
+        if(!(cflag & X509_FLAG_NO_SIGNAME)) {
                 if(X509_signature_print(bp, x->sig_alg, NULL) <= 0)
                         goto err;
 #if 0
@@ -180,14 +169,12 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
 #endif
         }
 
-        if(!(cflag & X509_FLAG_NO_ISSUER))
-        {
+        if(!(cflag & X509_FLAG_NO_ISSUER)) {
                 if (BIO_printf(bp,"        Issuer:%c",mlch) <= 0) goto err;
                 if (X509_NAME_print_ex(bp,X509_get_issuer_name(x),nmindent, nmflags) < 0) goto err;
                 if (BIO_write(bp,"\n",1) <= 0) goto err;
         }
-        if(!(cflag & X509_FLAG_NO_VALIDITY))
-        {
+        if(!(cflag & X509_FLAG_NO_VALIDITY)) {
                 if (BIO_write(bp,"        Validity\n",17) <= 0) goto err;
                 if (BIO_write(bp,"            Not Before: ",24) <= 0) goto err;
                 if (!ASN1_TIME_print(bp,X509_get_notBefore(x))) goto err;
@@ -195,14 +182,12 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
                 if (!ASN1_TIME_print(bp,X509_get_notAfter(x))) goto err;
                 if (BIO_write(bp,"\n",1) <= 0) goto err;
         }
-        if(!(cflag & X509_FLAG_NO_SUBJECT))
-        {
+        if(!(cflag & X509_FLAG_NO_SUBJECT)) {
                 if (BIO_printf(bp,"        Subject:%c",mlch) <= 0) goto err;
                 if (X509_NAME_print_ex(bp,X509_get_subject_name(x),nmindent, nmflags) < 0) goto err;
                 if (BIO_write(bp,"\n",1) <= 0) goto err;
         }
-        if(!(cflag & X509_FLAG_NO_PUBKEY))
-        {
+        if(!(cflag & X509_FLAG_NO_PUBKEY)) {
                 if (BIO_write(bp,"        Subject Public Key Info:\n",33) <= 0)
                         goto err;
                 if (BIO_printf(bp,"%12sPublic Key Algorithm: ","") <= 0)
@@ -213,13 +198,10 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
                         goto err;
 
                 pkey=X509_get_pubkey(x);
-                if (pkey == NULL)
-                {
+                if (pkey == NULL) {
                         BIO_printf(bp,"%12sUnable to load Public Key\n","");
                         ERR_print_errors(bp);
-                }
-                else
-                {
+                } else {
                         EVP_PKEY_print_public(bp, pkey, 16, NULL);
                         EVP_PKEY_free(pkey);
                 }
@@ -229,12 +211,10 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
                 X509V3_extensions_print(bp, "X509v3 extensions",
                                         ci->extensions, cflag, 8);
 
-        if(!(cflag & X509_FLAG_NO_SIGDUMP))
-        {
+        if(!(cflag & X509_FLAG_NO_SIGDUMP)) {
                 if(X509_signature_print(bp, x->sig_alg, x->signature) <= 0) goto err;
         }
-        if(!(cflag & X509_FLAG_NO_AUX))
-        {
+        if(!(cflag & X509_FLAG_NO_AUX)) {
                 if (!X509_CERT_AUX_print(bp, x->aux, 0)) goto err;
         }
         ret=1;
@@ -262,8 +242,7 @@ int X509_ocspid_print (BIO *bp, X509 *x)
 
         if (!EVP_Digest(der, derlen, SHA1md, NULL, EVP_sha1(), NULL))
                 goto err;
-        for (i=0; i < SHA_DIGEST_LENGTH; i++)
-        {
+        for (i=0; i < SHA_DIGEST_LENGTH; i++) {
                 if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0) goto err;
         }
         free (der);
@@ -278,8 +257,7 @@ int X509_ocspid_print (BIO *bp, X509 *x)
                         x->cert_info->key->public_key->length,
                         SHA1md, NULL, EVP_sha1(), NULL))
                 goto err;
-        for (i=0; i < SHA_DIGEST_LENGTH; i++)
-        {
+        for (i=0; i < SHA_DIGEST_LENGTH; i++) {
                 if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0)
                         goto err;
         }
@@ -298,10 +276,8 @@ int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent)
 
         n=sig->length;
         s=sig->data;
-        for (i=0; i<n; i++)
-        {
-                if ((i%18) == 0)
-                {
+        for (i=0; i<n; i++) {
+                if ((i%18) == 0) {
                         if (BIO_write(bp,"\n",1) <= 0) return 0;
                         if (BIO_indent(bp, indent, indent) <= 0) return 0;
                 }
@@ -320,12 +296,10 @@ int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig)
         if (i2a_ASN1_OBJECT(bp, sigalg->algorithm) <= 0) return 0;
 
         sig_nid = OBJ_obj2nid(sigalg->algorithm);
-        if (sig_nid != NID_undef)
-        {
+        if (sig_nid != NID_undef) {
                 int pkey_nid, dig_nid;
                 const EVP_PKEY_ASN1_METHOD *ameth;
-                if (OBJ_find_sigid_algs(sig_nid, &dig_nid, &pkey_nid))
-                {
+                if (OBJ_find_sigid_algs(sig_nid, &dig_nid, &pkey_nid)) {
                         ameth = EVP_PKEY_asn1_find(NULL, pkey_nid);
                         if (ameth && ameth->sig_print)
                                 return ameth->sig_print(bp, sigalg, sig, 9, 0);
@@ -347,16 +321,14 @@ int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)
         if (v == NULL) return(0);
         n=0;
         p=(const char *)v->data;
-        for (i=0; i<v->length; i++)
-        {
+        for (i=0; i<v->length; i++) {
                 if ((p[i] > '~') || ((p[i] < ' ') &&
                         (p[i] != '\n') && (p[i] != '\r')))
                         buf[n]='.';
                 else
                         buf[n]=p[i];
                 n++;
-                if (n >= 80)
-                {
+                if (n >= 80) {
                         if (BIO_write(bp,buf,n) <= 0)
                                 return(0);
                         n=0;
@@ -407,12 +379,10 @@ int ASN1_GENERALIZEDTIME_print(BIO *bp, const ASN1_GENERALIZEDTIME *tm)
         m=  (v[10]-'0')*10+(v[11]-'0');
         if (tm->length >= 14 &&
             (v[12] >= '0') && (v[12] <= '9') &&
-            (v[13] >= '0') && (v[13] <= '9'))
-        {
+            (v[13] >= '0') && (v[13] <= '9')) {
                 s=  (v[12]-'0')*10+(v[13]-'0');
                 /* Check for fractions of seconds. */
-                if (tm->length >= 15 && v[14] == '.')
-                {
+                if (tm->length >= 15 && v[14] == '.') {
                         int l = tm->length;
                         f = &v[14];     /* The decimal point. */
                         f_len = 1;
@@ -475,29 +445,25 @@ int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
         l=80-2-obase;
 
         b=X509_NAME_oneline(name,NULL,0);
-        if (!*b)
-        {
+        if (!*b) {
                 free(b);
                 return 1;
         }
         s=b+1; /* skip the first slash */
 
         c=s;
-        for (;;)
-        {
+        for (;;) {
                 if (    ((*s == '/') &&
                                 ((s[1] >= 'A') && (s[1] <= 'Z') && (
                                         (s[2] == '=') ||
                                         ((s[2] >= 'A') && (s[2] <= 'Z') &&
                                         (s[3] == '='))
                                  ))) ||
-                        (*s == '\0'))
-                {
+                        (*s == '\0')) {
                         i=s-c;
                         if (BIO_write(bp,c,i) != i) goto err;
                         c=s+1;  /* skip following slash */
-                        if (*s != '\0')
-                        {
+                        if (*s != '\0') {
                                 if (BIO_write(bp,", ",2) != 2) goto err;
                         }
                         l--;
@@ -508,8 +474,7 @@ int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
         }
         
         ret=1;
-        if (0)
-        {
+        if (0) {
 err:
                 X509err(X509_F_X509_NAME_PRINT,ERR_R_BUF_LIB);
         }