1 files changed, 364 insertions, 291 deletions

diff --git a/src/lib/libcrypto/ocsp/ocsp_ext.c b/src/lib/libcrypto/ocsp/ocsp_ext.c
index 9c7832b301..6ec8ca4adf 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ext.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ext.c
@@ -73,238 +73,285 @@
 
 /* OCSP request extensions */
 
-int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x)
-        {
-        return(X509v3_get_ext_count(x->tbsRequest->requestExtensions));
-        }
-
-int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos)
-        {
-        return(X509v3_get_ext_by_NID(x->tbsRequest->requestExtensions,nid,lastpos));
-        }
-
-int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj, int lastpos)
-        {
-        return(X509v3_get_ext_by_OBJ(x->tbsRequest->requestExtensions,obj,lastpos));
-        }
-
-int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos)
-        {
-        return(X509v3_get_ext_by_critical(x->tbsRequest->requestExtensions,crit,lastpos));
-        }
-
-X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc)
-        {
-        return(X509v3_get_ext(x->tbsRequest->requestExtensions,loc));
-        }
-
-X509_EXTENSION *OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc)
-        {
-        return(X509v3_delete_ext(x->tbsRequest->requestExtensions,loc));
-        }
-
-void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx)
-        {
+int
+OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x)
+{
+        return X509v3_get_ext_count(x->tbsRequest->requestExtensions);
+}
+
+int
+OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos)
+{
+        return X509v3_get_ext_by_NID(x->tbsRequest->requestExtensions, nid,
+            lastpos);
+}
+
+int
+OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj, int lastpos)
+{
+        return X509v3_get_ext_by_OBJ(x->tbsRequest->requestExtensions, obj,
+            lastpos);
+}
+
+int
+OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos)
+{
+        return X509v3_get_ext_by_critical(x->tbsRequest->requestExtensions,
+            crit, lastpos);
+}
+
+X509_EXTENSION *
+OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc)
+{
+        return X509v3_get_ext(x->tbsRequest->requestExtensions, loc);
+}
+
+X509_EXTENSION *
+OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc)
+{
+        return X509v3_delete_ext(x->tbsRequest->requestExtensions, loc);
+}
+
+void *
+OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx)
+{
         return X509V3_get_d2i(x->tbsRequest->requestExtensions, nid, crit, idx);
-        }
-
-int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
-                                                        unsigned long flags)
-        {
-        return X509V3_add1_i2d(&x->tbsRequest->requestExtensions, nid, value, crit, flags);
-        }
-
-int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc)
-        {
-        return(X509v3_add_ext(&(x->tbsRequest->requestExtensions),ex,loc) != NULL);
-        }
+}
+
+int
+OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
+    unsigned long flags)
+{
+        return X509V3_add1_i2d(&x->tbsRequest->requestExtensions, nid, value,
+            crit, flags);
+}
+
+int
+OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc)
+{
+        return X509v3_add_ext(&(x->tbsRequest->requestExtensions), ex, loc) !=
+            NULL;
+}
 
 /* Single extensions */
 
-int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x)
-        {
-        return(X509v3_get_ext_count(x->singleRequestExtensions));
-        }
-
-int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos)
-        {
-        return(X509v3_get_ext_by_NID(x->singleRequestExtensions,nid,lastpos));
-        }
-
-int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, int lastpos)
-        {
-        return(X509v3_get_ext_by_OBJ(x->singleRequestExtensions,obj,lastpos));
-        }
-
-int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos)
-        {
-        return(X509v3_get_ext_by_critical(x->singleRequestExtensions,crit,lastpos));
-        }
-
-X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc)
-        {
-        return(X509v3_get_ext(x->singleRequestExtensions,loc));
-        }
-
-X509_EXTENSION *OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc)
-        {
-        return(X509v3_delete_ext(x->singleRequestExtensions,loc));
-        }
+int
+OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x)
+{
+        return X509v3_get_ext_count(x->singleRequestExtensions);
+}
+
+int
+OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos)
+{
+        return X509v3_get_ext_by_NID(x->singleRequestExtensions, nid, lastpos);
+}
+
+int
+OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, int lastpos)
+{
+        return X509v3_get_ext_by_OBJ(x->singleRequestExtensions, obj, lastpos);
+}
+
+int
+OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos)
+{
+        return X509v3_get_ext_by_critical(x->singleRequestExtensions, crit,
+            lastpos);
+}
+
+X509_EXTENSION *
+OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc)
+{
+        return X509v3_get_ext(x->singleRequestExtensions, loc);
+}
+
+X509_EXTENSION *
+OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc)
+{
+        return X509v3_delete_ext(x->singleRequestExtensions, loc);
+}
 
 void *OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx)
-        {
+{
         return X509V3_get_d2i(x->singleRequestExtensions, nid, crit, idx);
-        }
-
-int OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
-                                                        unsigned long flags)
-        {
-        return X509V3_add1_i2d(&x->singleRequestExtensions, nid, value, crit, flags);
-        }
-
-int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc)
-        {
-        return(X509v3_add_ext(&(x->singleRequestExtensions),ex,loc) != NULL);
-        }
+}
+
+int
+OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
+    unsigned long flags)
+{
+        return X509V3_add1_i2d(&x->singleRequestExtensions, nid, value, crit,
+            flags);
+}
+
+int
+OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc)
+{
+        return X509v3_add_ext(&(x->singleRequestExtensions), ex, loc) != NULL;
+}
 
 /* OCSP Basic response */
 
-int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x)
-        {
-        return(X509v3_get_ext_count(x->tbsResponseData->responseExtensions));
-        }
-
-int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos)
-        {
-        return(X509v3_get_ext_by_NID(x->tbsResponseData->responseExtensions,nid,lastpos));
-        }
-
-int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj, int lastpos)
-        {
-        return(X509v3_get_ext_by_OBJ(x->tbsResponseData->responseExtensions,obj,lastpos));
-        }
-
-int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit, int lastpos)
-        {
-        return(X509v3_get_ext_by_critical(x->tbsResponseData->responseExtensions,crit,lastpos));
-        }
-
-X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc)
-        {
-        return(X509v3_get_ext(x->tbsResponseData->responseExtensions,loc));
-        }
-
-X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc)
-        {
-        return(X509v3_delete_ext(x->tbsResponseData->responseExtensions,loc));
-        }
-
-void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit, int *idx)
-        {
-        return X509V3_get_d2i(x->tbsResponseData->responseExtensions, nid, crit, idx);
-        }
-
-int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value, int crit,
-                                                        unsigned long flags)
-        {
-        return X509V3_add1_i2d(&x->tbsResponseData->responseExtensions, nid, value, crit, flags);
-        }
-
-int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc)
-        {
-        return(X509v3_add_ext(&(x->tbsResponseData->responseExtensions),ex,loc) != NULL);
-        }
+int
+OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x)
+{
+        return X509v3_get_ext_count(x->tbsResponseData->responseExtensions);
+}
+
+int
+OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos)
+{
+        return X509v3_get_ext_by_NID(x->tbsResponseData->responseExtensions,
+            nid ,lastpos);
+}
+
+int
+OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj, int lastpos)
+{
+        return X509v3_get_ext_by_OBJ(x->tbsResponseData->responseExtensions,
+            obj, lastpos);
+}
+
+int
+OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit, int lastpos)
+{
+        return X509v3_get_ext_by_critical(x->tbsResponseData->responseExtensions,
+            crit, lastpos);
+}
+
+X509_EXTENSION *
+OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc)
+{
+        return X509v3_get_ext(x->tbsResponseData->responseExtensions, loc);
+}
+
+X509_EXTENSION *
+OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc)
+{
+        return X509v3_delete_ext(x->tbsResponseData->responseExtensions, loc);
+}
+
+void *
+OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit, int *idx)
+{
+        return X509V3_get_d2i(x->tbsResponseData->responseExtensions, nid,
+            crit, idx);
+}
+
+int
+OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value, int crit,
+    unsigned long flags)
+{
+        return X509V3_add1_i2d(&x->tbsResponseData->responseExtensions, nid,
+            value, crit, flags);
+}
+
+int
+OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc)
+{
+        return X509v3_add_ext(&(x->tbsResponseData->responseExtensions), ex,
+            loc) != NULL;
+}
 
 /* OCSP single response extensions */
 
-int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x)
-        {
-        return(X509v3_get_ext_count(x->singleExtensions));
-        }
-
-int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos)
-        {
-        return(X509v3_get_ext_by_NID(x->singleExtensions,nid,lastpos));
-        }
-
-int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj, int lastpos)
-        {
-        return(X509v3_get_ext_by_OBJ(x->singleExtensions,obj,lastpos));
-        }
-
-int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit, int lastpos)
-        {
-        return(X509v3_get_ext_by_critical(x->singleExtensions,crit,lastpos));
-        }
-
-X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc)
-        {
-        return(X509v3_get_ext(x->singleExtensions,loc));
-        }
-
-X509_EXTENSION *OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc)
-        {
-        return(X509v3_delete_ext(x->singleExtensions,loc));
-        }
-
-void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit, int *idx)
-        {
+int
+OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x)
+{
+        return X509v3_get_ext_count(x->singleExtensions);
+}
+
+int
+OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos)
+{
+        return X509v3_get_ext_by_NID(x->singleExtensions, nid, lastpos);
+}
+
+int
+OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj,
+    int lastpos)
+{
+        return X509v3_get_ext_by_OBJ(x->singleExtensions, obj, lastpos);
+}
+
+int
+OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit, int lastpos)
+{
+        return X509v3_get_ext_by_critical(x->singleExtensions, crit, lastpos);
+}
+
+X509_EXTENSION *
+OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc)
+{
+        return X509v3_get_ext(x->singleExtensions, loc);
+}
+
+X509_EXTENSION *
+OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc)
+{
+        return X509v3_delete_ext(x->singleExtensions, loc);
+}
+
+void *
+OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit, int *idx)
+{
         return X509V3_get_d2i(x->singleExtensions, nid, crit, idx);
-        }
+}
 
-int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value, int crit,
-                                                        unsigned long flags)
-        {
+int
+OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value, int crit,
+    unsigned long flags)
+{
         return X509V3_add1_i2d(&x->singleExtensions, nid, value, crit, flags);
-        }
+}
 
-int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc)
-        {
-        return(X509v3_add_ext(&(x->singleExtensions),ex,loc) != NULL);
-        }
+int
+OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc)
+{
+        return X509v3_add_ext(&(x->singleExtensions), ex, loc) != NULL;
+}
 
 /* also CRL Entry Extensions */
 #if 0
-ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
-                                void *data, STACK_OF(ASN1_OBJECT) *sk)
-        {
+ASN1_STRING *
+ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d, void *data,
+    STACK_OF(ASN1_OBJECT) *sk)
+{
         int i;
         unsigned char *p, *b = NULL;
 
-        if (data)
-                {
-                if ((i=i2d(data,NULL)) <= 0) goto err;
-                if (!(b=p=malloc((unsigned int)i)))
+        if (data) {
+                if ((i = i2d(data, NULL)) <= 0)
                         goto err;
-                if (i2d(data, &p) <= 0) goto err;
-                }
-        else if (sk)
-                {
-                if ((i=i2d_ASN1_SET_OF_ASN1_OBJECT(sk,NULL,
-                                                   (I2D_OF(ASN1_OBJECT))i2d,
-                                                   V_ASN1_SEQUENCE,
-                                                   V_ASN1_UNIVERSAL,
-                                                   IS_SEQUENCE))<=0) goto err;
-                if (!(b=p=malloc((unsigned int)i)))
+                if (!(b = p = malloc((unsigned int)i)))
+                        goto err;
+                if (i2d(data, &p) <= 0)
+                        goto err;
+        } else if (sk) {
+                if ((i = i2d_ASN1_SET_OF_ASN1_OBJECT(sk,NULL,
+                    (I2D_OF(ASN1_OBJECT))i2d, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL,
+                    IS_SEQUENCE)) <= 0)
+                        goto err;
+                if (!(b = p = malloc((unsigned int)i)))
                         goto err;
                 if (i2d_ASN1_SET_OF_ASN1_OBJECT(sk,&p,(I2D_OF(ASN1_OBJECT))i2d,
-                                                V_ASN1_SEQUENCE,
-                                                V_ASN1_UNIVERSAL,
-                                                IS_SEQUENCE)<=0) goto err;
-                }
-        else
-                {
-                OCSPerr(OCSP_F_ASN1_STRING_ENCODE,OCSP_R_BAD_DATA);
+                    V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL, IS_SEQUENCE) <= 0)
+                        goto err;
+        } else {
+                OCSPerr(OCSP_F_ASN1_STRING_ENCODE, OCSP_R_BAD_DATA);
+                goto err;
+        }
+        if (!s && !(s = ASN1_STRING_new()))
+                goto err;
+        if (!(ASN1_STRING_set(s, b, i)))
                 goto err;
-                }
-        if (!s && !(s = ASN1_STRING_new())) goto err;
-        if (!(ASN1_STRING_set(s, b, i))) goto err;
         free(b);
         return s;
 err:
-        if (b) free(b);
+        free(b);
         return NULL;
-        }
+}
 #endif
 
 /* Nonce handling functions */
@@ -315,16 +362,19 @@ err:
  * nonce, previous versions used the raw nonce.
  */
 
-static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts, unsigned char *val, int len)
-        {
+static int
+ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts, unsigned char *val, int len)
+{
         unsigned char *tmpval;
         ASN1_OCTET_STRING os;
         int ret = 0;
-        if (len <= 0) len = OCSP_DEFAULT_NONCE_LENGTH;
+
+        if (len <= 0)
+                len = OCSP_DEFAULT_NONCE_LENGTH;
         /* Create the OCTET STRING manually by writing out the header and
          * appending the content octets. This avoids an extra memory allocation
          * operation in some cases. Applications should *NOT* do this because
-         * it relies on library internals.
+         * it relies on library internals.
          */
         os.length = ASN1_object_size(0, len, V_ASN1_OCTET_STRING);
         os.data = malloc(os.length);
@@ -336,30 +386,29 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts, unsigned char *val,
                 memcpy(tmpval, val, len);
         else
                 RAND_pseudo_bytes(tmpval, len);
-        if(!X509V3_add1_i2d(exts, NID_id_pkix_OCSP_Nonce,
-                        &os, 0, X509V3_ADD_REPLACE))
-                                goto err;
+        if (!X509V3_add1_i2d(exts, NID_id_pkix_OCSP_Nonce, &os, 0,
+            X509V3_ADD_REPLACE))
+                goto err;
         ret = 1;
-        err:
-        if (os.data)
-                free(os.data);
+err:
+        free(os.data);
         return ret;
-        }
-
+}
 
 /* Add nonce to an OCSP request */
-
-int OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len)
-        {
+int
+OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len)
+{
         return ocsp_add1_nonce(&req->tbsRequest->requestExtensions, val, len);
-        }
+}
 
 /* Same as above but for a response */
-
-int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len)
-        {
-        return ocsp_add1_nonce(&resp->tbsResponseData->responseExtensions, val, len);
-        }
+int
+OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len)
+{
+        return ocsp_add1_nonce(&resp->tbsResponseData->responseExtensions, val,
+            len);
+}
 
 /* Check nonce validity in a request and response.
  * Return value reflects result:
@@ -373,9 +422,9 @@ int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len)
  *  If responder doesn't handle nonces return != 0 may be
  *  necessary. return == 0 is always an error.
  */
-
-int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs)
-        {
+int
+OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs)
+{
         /*
          * Since we are only interested in the presence or absence of
          * the nonce and comparing its value there is no need to use
@@ -383,136 +432,160 @@ int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs)
          * ASN1_OCTET_STRING structure for the value which would be
          * freed immediately anyway.
          */
-
         int req_idx, resp_idx;
         X509_EXTENSION *req_ext, *resp_ext;
+
         req_idx = OCSP_REQUEST_get_ext_by_NID(req, NID_id_pkix_OCSP_Nonce, -1);
         resp_idx = OCSP_BASICRESP_get_ext_by_NID(bs, NID_id_pkix_OCSP_Nonce, -1);
         /* Check both absent */
-        if((req_idx < 0) && (resp_idx < 0))
+        if (req_idx < 0 && resp_idx < 0)
                 return 2;
         /* Check in request only */
-        if((req_idx >= 0) && (resp_idx < 0))
+        if (req_idx >= 0 && resp_idx < 0)
                 return -1;
         /* Check in response but not request */
-        if((req_idx < 0) && (resp_idx >= 0))
+        if (req_idx < 0 && resp_idx >= 0)
                 return 3;
         /* Otherwise nonce in request and response so retrieve the extensions */
         req_ext = OCSP_REQUEST_get_ext(req, req_idx);
         resp_ext = OCSP_BASICRESP_get_ext(bs, resp_idx);
-        if(ASN1_OCTET_STRING_cmp(req_ext->value, resp_ext->value))
+        if (ASN1_OCTET_STRING_cmp(req_ext->value, resp_ext->value))
                 return 0;
         return 1;
-        }
+}
 
 /* Copy the nonce value (if any) from an OCSP request to 
  * a response.
  */
-
-int OCSP_copy_nonce(OCSP_BASICRESP *resp, OCSP_REQUEST *req)
-        {
+int
+OCSP_copy_nonce(OCSP_BASICRESP *resp, OCSP_REQUEST *req)
+{
         X509_EXTENSION *req_ext;
         int req_idx;
+
         /* Check for nonce in request */
         req_idx = OCSP_REQUEST_get_ext_by_NID(req, NID_id_pkix_OCSP_Nonce, -1);
         /* If no nonce that's OK */
-        if (req_idx < 0) return 2;
+        if (req_idx < 0)
+                return 2;
         req_ext = OCSP_REQUEST_get_ext(req, req_idx);
         return OCSP_BASICRESP_add_ext(resp, req_ext, -1);
-        }
+}
 
-X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim)
-        {
+X509_EXTENSION *
+OCSP_crlID_new(char *url, long *n, char *tim)
+{
         X509_EXTENSION *x = NULL;
         OCSP_CRLID *cid = NULL;
         
-        if (!(cid = OCSP_CRLID_new())) goto err;
-        if (url)
-                {
-                if (!(cid->crlUrl = ASN1_IA5STRING_new())) goto err;
-                if (!(ASN1_STRING_set(cid->crlUrl, url, -1))) goto err;
-                }
-        if (n)
-                {
-                if (!(cid->crlNum = ASN1_INTEGER_new())) goto err;
-                if (!(ASN1_INTEGER_set(cid->crlNum, *n))) goto err;
-                }
-        if (tim)
-                {
-                if (!(cid->crlTime = ASN1_GENERALIZEDTIME_new())) goto err;
+        if (!(cid = OCSP_CRLID_new()))
+                goto err;
+        if (url) {
+                if (!(cid->crlUrl = ASN1_IA5STRING_new()))
+                        goto err;
+                if (!(ASN1_STRING_set(cid->crlUrl, url, -1)))
+                        goto err;
+        }
+        if (n) {
+                if (!(cid->crlNum = ASN1_INTEGER_new()))
+                        goto err;
+                if (!(ASN1_INTEGER_set(cid->crlNum, *n)))
+                        goto err;
+        }
+        if (tim) {
+                if (!(cid->crlTime = ASN1_GENERALIZEDTIME_new()))
+                        goto err;
                 if (!(ASN1_GENERALIZEDTIME_set_string(cid->crlTime, tim))) 
-                        goto err;
-                }
+                        goto err;
+        }
         x = X509V3_EXT_i2d(NID_id_pkix_OCSP_CrlID, 0, cid);
 err:
-        if (cid) OCSP_CRLID_free(cid);
+        if (cid)
+                OCSP_CRLID_free(cid);
         return x;
-        }
+}
 
 /*   AcceptableResponses ::= SEQUENCE OF OBJECT IDENTIFIER */
-X509_EXTENSION *OCSP_accept_responses_new(char **oids)
-        {
+X509_EXTENSION *
+OCSP_accept_responses_new(char **oids)
+{
         int nid;
         STACK_OF(ASN1_OBJECT) *sk = NULL;
         ASN1_OBJECT *o = NULL;
-        X509_EXTENSION *x = NULL;
+        X509_EXTENSION *x = NULL;
 
-        if (!(sk = sk_ASN1_OBJECT_new_null())) goto err;
-        while (oids && *oids)
-                {
-                if ((nid=OBJ_txt2nid(*oids))!=NID_undef&&(o=OBJ_nid2obj(nid))) 
-                        sk_ASN1_OBJECT_push(sk, o);
+        if (!(sk = sk_ASN1_OBJECT_new_null()))
+                goto err;
+        while (oids && *oids) {
+                if ((nid = OBJ_txt2nid(*oids)) != NID_undef &&
+                    (o = OBJ_nid2obj(nid))) 
+                        sk_ASN1_OBJECT_push(sk, o);
                 oids++;
-                }
+        }
         x = X509V3_EXT_i2d(NID_id_pkix_OCSP_acceptableResponses, 0, sk);
 err:
-        if (sk) sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free);
+        if (sk)
+                sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free);
         return x;
-        }
+}
 
 /*  ArchiveCutoff ::= GeneralizedTime */
-X509_EXTENSION *OCSP_archive_cutoff_new(char* tim)
-        {
-        X509_EXTENSION *x=NULL;
+X509_EXTENSION *
+OCSP_archive_cutoff_new(char* tim)
+{
+        X509_EXTENSION *x = NULL;
         ASN1_GENERALIZEDTIME *gt = NULL;
 
-        if (!(gt = ASN1_GENERALIZEDTIME_new())) goto err;
-        if (!(ASN1_GENERALIZEDTIME_set_string(gt, tim))) goto err;
+        if (!(gt = ASN1_GENERALIZEDTIME_new()))
+                goto err;
+        if (!(ASN1_GENERALIZEDTIME_set_string(gt, tim)))
+                goto err;
         x = X509V3_EXT_i2d(NID_id_pkix_OCSP_archiveCutoff, 0, gt);
 err:
-        if (gt) ASN1_GENERALIZEDTIME_free(gt);
+        if (gt)
+                ASN1_GENERALIZEDTIME_free(gt);
         return x;
-        }
+}
 
 /* per ACCESS_DESCRIPTION parameter are oids, of which there are currently
  * two--NID_ad_ocsp, NID_id_ad_caIssuers--and GeneralName value.  This
  * method forces NID_ad_ocsp and uniformResourceLocator [6] IA5String.
  */
-X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME* issuer, char **urls)
-        {
+X509_EXTENSION *
+OCSP_url_svcloc_new(X509_NAME* issuer, char **urls)
+{
         X509_EXTENSION *x = NULL;
         ASN1_IA5STRING *ia5 = NULL;
         OCSP_SERVICELOC *sloc = NULL;
         ACCESS_DESCRIPTION *ad = NULL;
         
-        if (!(sloc = OCSP_SERVICELOC_new())) goto err;
-        if (!(sloc->issuer = X509_NAME_dup(issuer))) goto err;
-        if (urls && *urls && !(sloc->locator = sk_ACCESS_DESCRIPTION_new_null())) goto err;
-        while (urls && *urls)
-                {
-                if (!(ad = ACCESS_DESCRIPTION_new())) goto err;
-                if (!(ad->method=OBJ_nid2obj(NID_ad_OCSP))) goto err;
-                if (!(ad->location = GENERAL_NAME_new())) goto err;
-                if (!(ia5 = ASN1_IA5STRING_new())) goto err;
-                if (!ASN1_STRING_set((ASN1_STRING*)ia5, *urls, -1)) goto err;
+        if (!(sloc = OCSP_SERVICELOC_new()))
+                goto err;
+        if (!(sloc->issuer = X509_NAME_dup(issuer)))
+                goto err;
+        if (urls && *urls &&
+            !(sloc->locator = sk_ACCESS_DESCRIPTION_new_null()))
+                goto err;
+        while (urls && *urls) {
+                if (!(ad = ACCESS_DESCRIPTION_new()))
+                        goto err;
+                if (!(ad->method = OBJ_nid2obj(NID_ad_OCSP)))
+                        goto err;
+                if (!(ad->location = GENERAL_NAME_new()))
+                        goto err;
+                if (!(ia5 = ASN1_IA5STRING_new()))
+                        goto err;
+                if (!ASN1_STRING_set((ASN1_STRING*)ia5, *urls, -1))
+                        goto err;
                 ad->location->type = GEN_URI;
                 ad->location->d.ia5 = ia5;
-                if (!sk_ACCESS_DESCRIPTION_push(sloc->locator, ad)) goto err;
+                if (!sk_ACCESS_DESCRIPTION_push(sloc->locator, ad))
+                        goto err;
                 urls++;
-                }
+        }
         x = X509V3_EXT_i2d(NID_id_pkix_OCSP_serviceLocator, 0, sloc);
 err:
-        if (sloc) OCSP_SERVICELOC_free(sloc);
+        if (sloc)
+                OCSP_SERVICELOC_free(sloc);
         return x;
-        }
-
+}