1 files changed, 51 insertions, 49 deletions

diff --git a/src/lib/libcrypto/ocsp/ocsp_prn.c b/src/lib/libcrypto/ocsp/ocsp_prn.c
index 9e4b81f061..b5031cd091 100644
--- a/src/lib/libcrypto/ocsp/ocsp_prn.c
+++ b/src/lib/libcrypto/ocsp/ocsp_prn.c
@@ -15,7 +15,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -93,7 +93,7 @@ table2string(long s, const OCSP_TBLSTR *ts, int len)
 {
         const OCSP_TBLSTR *p;
 
-        for (p=ts; p < ts + len; p++)
+        for (p = ts; p < ts + len; p++)
                 if (p->t == s)
                         return p->m;
         return "(UNKNOWN)";
@@ -103,42 +103,42 @@ const char *
 OCSP_response_status_str(long s)
 {
         static const OCSP_TBLSTR rstat_tbl[] = {
-            { OCSP_RESPONSE_STATUS_SUCCESSFUL, "successful" },
-            { OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, "malformedrequest" },
-            { OCSP_RESPONSE_STATUS_INTERNALERROR, "internalerror" },
-            { OCSP_RESPONSE_STATUS_TRYLATER, "trylater" },
-            { OCSP_RESPONSE_STATUS_SIGREQUIRED, "sigrequired" },
-            { OCSP_RESPONSE_STATUS_UNAUTHORIZED, "unauthorized" }
+                { OCSP_RESPONSE_STATUS_SUCCESSFUL, "successful" },
+                { OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, "malformedrequest" },
+                { OCSP_RESPONSE_STATUS_INTERNALERROR, "internalerror" },
+                { OCSP_RESPONSE_STATUS_TRYLATER, "trylater" },
+                { OCSP_RESPONSE_STATUS_SIGREQUIRED, "sigrequired" },
+                { OCSP_RESPONSE_STATUS_UNAUTHORIZED, "unauthorized" }
         };
         return table2string(s, rstat_tbl, 6);
-} 
+}
 
 const char *
 OCSP_cert_status_str(long s)
 {
         static const OCSP_TBLSTR cstat_tbl[] = {
-            { V_OCSP_CERTSTATUS_GOOD, "good" },
-            { V_OCSP_CERTSTATUS_REVOKED, "revoked" },
-            { V_OCSP_CERTSTATUS_UNKNOWN, "unknown" }
+                { V_OCSP_CERTSTATUS_GOOD, "good" },
+                { V_OCSP_CERTSTATUS_REVOKED, "revoked" },
+                { V_OCSP_CERTSTATUS_UNKNOWN, "unknown" }
         };
         return table2string(s, cstat_tbl, 3);
-} 
+}
 
 const char *
 OCSP_crl_reason_str(long s)
 {
         static const OCSP_TBLSTR reason_tbl[] = {
-            { OCSP_REVOKED_STATUS_UNSPECIFIED, "unspecified" },
-            { OCSP_REVOKED_STATUS_KEYCOMPROMISE, "keyCompromise" },
-            { OCSP_REVOKED_STATUS_CACOMPROMISE, "cACompromise" },
-            { OCSP_REVOKED_STATUS_AFFILIATIONCHANGED, "affiliationChanged" },
-            { OCSP_REVOKED_STATUS_SUPERSEDED, "superseded" },
-            { OCSP_REVOKED_STATUS_CESSATIONOFOPERATION, "cessationOfOperation" },
-            { OCSP_REVOKED_STATUS_CERTIFICATEHOLD, "certificateHold" },
-            { OCSP_REVOKED_STATUS_REMOVEFROMCRL, "removeFromCRL" }
+                { OCSP_REVOKED_STATUS_UNSPECIFIED, "unspecified" },
+                { OCSP_REVOKED_STATUS_KEYCOMPROMISE, "keyCompromise" },
+                { OCSP_REVOKED_STATUS_CACOMPROMISE, "cACompromise" },
+                { OCSP_REVOKED_STATUS_AFFILIATIONCHANGED, "affiliationChanged" },
+                { OCSP_REVOKED_STATUS_SUPERSEDED, "superseded" },
+                { OCSP_REVOKED_STATUS_CESSATIONOFOPERATION, "cessationOfOperation" },
+                { OCSP_REVOKED_STATUS_CERTIFICATEHOLD, "certificateHold" },
+                { OCSP_REVOKED_STATUS_REMOVEFROMCRL, "removeFromCRL" }
         };
         return table2string(s, reason_tbl, 8);
-} 
+}
 
 int
 OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST* o, unsigned long flags)
@@ -150,17 +150,17 @@ OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST* o, unsigned long flags)
         OCSP_REQINFO *inf = o->tbsRequest;
         OCSP_SIGNATURE *sig = o->optionalSignature;
 
-        if (BIO_write(bp,"OCSP Request Data:\n",19) <= 0)
+        if (BIO_write(bp, "OCSP Request Data:\n", 19) <= 0)
                 goto err;
         l = ASN1_INTEGER_get(inf->version);
-        if (BIO_printf(bp,"    Version: %lu (0x%lx)",l+1,l) <= 0)
+        if (BIO_printf(bp, "    Version: %lu (0x%lx)", l+1, l) <= 0)
                 goto err;
         if (inf->requestorName != NULL) {
-                if (BIO_write(bp,"\n    Requestor Name: ",21) <= 0) 
+                if (BIO_write(bp, "\n    Requestor Name: ", 21) <= 0)
                         goto err;
                 GENERAL_NAME_print(bp, inf->requestorName);
         }
-        if (BIO_write(bp,"\n    Requestor List:\n",21) <= 0)
+        if (BIO_write(bp, "\n    Requestor List:\n", 21) <= 0)
                 goto err;
         for (i = 0; i < sk_OCSP_ONEREQ_num(inf->requestList); i++) {
                 one = sk_OCSP_ONEREQ_value(inf->requestList, i);
@@ -176,12 +176,13 @@ OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST* o, unsigned long flags)
         if (sig) {
                 X509_signature_print(bp, sig->signatureAlgorithm,
                     sig->signature);
-                for (i=0; i<sk_X509_num(sig->certs); i++) {
-                        X509_print(bp, sk_X509_value(sig->certs,i));
-                        PEM_write_bio_X509(bp,sk_X509_value(sig->certs,i));
+                for (i = 0; i < sk_X509_num(sig->certs); i++) {
+                        X509_print(bp, sk_X509_value(sig->certs, i));
+                        PEM_write_bio_X509(bp, sk_X509_value(sig->certs, i));
                 }
         }
         return 1;
+
 err:
         return 0;
 }
@@ -200,20 +201,20 @@ OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
         OCSP_SINGLERESP *single = NULL;
         OCSP_RESPBYTES *rb = o->responseBytes;
 
-        if (BIO_puts(bp,"OCSP Response Data:\n") <= 0)
+        if (BIO_puts(bp, "OCSP Response Data:\n") <= 0)
                 goto err;
         l = ASN1_ENUMERATED_get(o->responseStatus);
-        if (BIO_printf(bp,"    OCSP Response Status: %s (0x%lx)\n",
+        if (BIO_printf(bp, "    OCSP Response Status: %s (0x%lx)\n",
             OCSP_response_status_str(l), l) <= 0)
                 goto err;
         if (rb == NULL)
                 return 1;
-        if (BIO_puts(bp,"    Response Type: ") <= 0)
+        if (BIO_puts(bp, "    Response Type: ") <= 0)
                 goto err;
-        if(i2a_ASN1_OBJECT(bp, rb->responseType) <= 0)
+        if (i2a_ASN1_OBJECT(bp, rb->responseType) <= 0)
                 goto err;
         if (OBJ_obj2nid(rb->responseType) != NID_id_pkix_OCSP_basic) {
-                BIO_puts(bp," (unknown response type)\n");
+                BIO_puts(bp, " (unknown response type)\n");
                 return 1;
         }
 
@@ -222,12 +223,12 @@ OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
                 goto err;
         rd = br->tbsResponseData;
         l = ASN1_INTEGER_get(rd->version);
-        if (BIO_printf(bp,"\n    Version: %lu (0x%lx)\n", l+1,l) <= 0)
+        if (BIO_printf(bp, "\n    Version: %lu (0x%lx)\n", l+1, l) <= 0)
                 goto err;
-        if (BIO_puts(bp,"    Responder Id: ") <= 0)
+        if (BIO_puts(bp, "    Responder Id: ") <= 0)
                 goto err;
 
-        rid =  rd->responderId;
+        rid = rd->responderId;
         switch (rid->type) {
         case V_OCSP_RESPID_NAME:
                 X509_NAME_print_ex(bp, rid->value.byName, 0, XN_FLAG_ONELINE);
@@ -237,11 +238,11 @@ OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
                 break;
         }
 
-        if (BIO_printf(bp,"\n    Produced At: ")<=0)
+        if (BIO_printf(bp, "\n    Produced At: ")<=0)
                 goto err;
         if (!ASN1_GENERALIZEDTIME_print(bp, rd->producedAt))
                 goto err;
-        if (BIO_printf(bp,"\n    Responses:\n") <= 0)
+        if (BIO_printf(bp, "\n    Responses:\n") <= 0)
                 goto err;
         for (i = 0; i < sk_OCSP_SINGLERESP_num(rd->responses); i++) {
                 if (! sk_OCSP_SINGLERESP_value(rd->responses, i))
@@ -251,15 +252,15 @@ OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
                 if (ocsp_certid_print(bp, cid, 4) <= 0)
                         goto err;
                 cst = single->certStatus;
-                if (BIO_printf(bp,"    Cert Status: %s",
+                if (BIO_printf(bp, "    Cert Status: %s",
                     OCSP_cert_status_str(cst->type)) <= 0)
                         goto err;
                 if (cst->type == V_OCSP_CERTSTATUS_REVOKED) {
                         rev = cst->value.revoked;
-                        if (BIO_printf(bp, "\n    Revocation Time: ") <= 0) 
+                        if (BIO_printf(bp, "\n    Revocation Time: ") <= 0)
                                 goto err;
                         if (!ASN1_GENERALIZEDTIME_print(bp,
-                            rev->revocationTime)) 
+                            rev->revocationTime))
                                 goto err;
                         if (rev->revocationReason) {
                                 l = ASN1_ENUMERATED_get(rev->revocationReason);
@@ -269,22 +270,22 @@ OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
                                         goto err;
                         }
                 }
-                if (BIO_printf(bp,"\n    This Update: ") <= 0)
+                if (BIO_printf(bp, "\n    This Update: ") <= 0)
                         goto err;
-                if (!ASN1_GENERALIZEDTIME_print(bp, single->thisUpdate)) 
+                if (!ASN1_GENERALIZEDTIME_print(bp, single->thisUpdate))
                         goto err;
                 if (single->nextUpdate) {
-                        if (BIO_printf(bp,"\n    Next Update: ") <= 0)
+                        if (BIO_printf(bp, "\n    Next Update: ") <= 0)
                                 goto err;
-                        if (!ASN1_GENERALIZEDTIME_print(bp,single->nextUpdate))
+                        if (!ASN1_GENERALIZEDTIME_print(bp, single->nextUpdate))
                                 goto err;
                 }
-                if (BIO_write(bp,"\n",1) <= 0)
+                if (BIO_write(bp, "\n", 1) <= 0)
                         goto err;
                 if (!X509V3_extensions_print(bp, "Response Single Extensions",
                     single->singleExtensions, flags, 8))
                         goto err;
-                if (BIO_write(bp,"\n",1) <= 0)
+                if (BIO_write(bp, "\n", 1) <= 0)
                         goto err;
         }
         if (!X509V3_extensions_print(bp, "Response Extensions",
@@ -296,10 +297,11 @@ OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
 
         for (i = 0; i < sk_X509_num(br->certs); i++) {
                 X509_print(bp, sk_X509_value(br->certs, i));
-                PEM_write_bio_X509(bp,sk_X509_value(br->certs, i));
+                PEM_write_bio_X509(bp, sk_X509_value(br->certs, i));
         }
 
         ret = 1;
+
 err:
         OCSP_BASICRESP_free(br);
         return ret;