1 files changed, 87 insertions, 77 deletions

diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c
index ea94f026b2..674cca4a1c 100644
--- a/src/lib/libcrypto/asn1/x_crl.c
+++ b/src/lib/libcrypto/asn1/x_crl.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -64,23 +64,23 @@
 #include <openssl/x509v3.h>
 
 static int X509_REVOKED_cmp(const X509_REVOKED * const *a,
-                                const X509_REVOKED * const *b);
+    const X509_REVOKED * const *b);
 static void setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp);
 
 ASN1_SEQUENCE(X509_REVOKED) = {
-        ASN1_SIMPLE(X509_REVOKED,serialNumber, ASN1_INTEGER),
-        ASN1_SIMPLE(X509_REVOKED,revocationDate, ASN1_TIME),
-        ASN1_SEQUENCE_OF_OPT(X509_REVOKED,extensions, X509_EXTENSION)
+        ASN1_SIMPLE(X509_REVOKED, serialNumber, ASN1_INTEGER),
+        ASN1_SIMPLE(X509_REVOKED, revocationDate, ASN1_TIME),
+        ASN1_SEQUENCE_OF_OPT(X509_REVOKED, extensions, X509_EXTENSION)
 } ASN1_SEQUENCE_END(X509_REVOKED)
 
 static int def_crl_verify(X509_CRL *crl, EVP_PKEY *r);
-static int def_crl_lookup(X509_CRL *crl,
-                X509_REVOKED **ret, ASN1_INTEGER *serial, X509_NAME *issuer);
+static int def_crl_lookup(X509_CRL *crl, X509_REVOKED **ret,
+    ASN1_INTEGER *serial, X509_NAME *issuer);
 
-static X509_CRL_METHOD int_crl_meth =
-{
+static X509_CRL_METHOD int_crl_meth = {
+        0,
+        0,
         0,
-        0,0,
         def_crl_lookup,
         def_crl_verify
 };
@@ -91,18 +91,19 @@ static const X509_CRL_METHOD *default_crl_method = &int_crl_meth;
  * Since we cache the original encoding the signature wont be affected by
  * reordering of the revoked field.
  */
-static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                                                void *exarg)
+static int
+crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 {
         X509_CRL_INFO *a = (X509_CRL_INFO *)*pval;
 
-        if(!a || !a->revoked) return 1;
-        switch(operation) {
+        if (!a || !a->revoked)
+                return 1;
+        switch (operation) {
                 /* Just set cmp function here. We don't sort because that
                  * would affect the output of X509_CRL_print().
                  */
         case ASN1_OP_D2I_POST:
-                (void)sk_X509_REVOKED_set_cmp_func(a->revoked,X509_REVOKED_cmp);
+                (void)sk_X509_REVOKED_set_cmp_func(a->revoked, X509_REVOKED_cmp);
                 break;
         }
         return 1;
@@ -123,9 +124,9 @@ ASN1_SEQUENCE_enc(X509_CRL_INFO, enc, crl_inf_cb) = {
  * Check for unhandled critical CRL entry extensions.
  */
 
-static int crl_set_issuers(X509_CRL *crl)
+static int
+crl_set_issuers(X509_CRL *crl)
 {
-
         int i, j;
         GENERAL_NAMES *gens, *gtmp;
         STACK_OF(X509_REVOKED) *revoked;
@@ -138,9 +139,8 @@ static int crl_set_issuers(X509_CRL *crl)
                 STACK_OF(X509_EXTENSION) *exts;
                 ASN1_ENUMERATED *reason;
                 X509_EXTENSION *ext;
-                gtmp = X509_REVOKED_get_ext_d2i(rev, 
-                                                NID_certificate_issuer,
-                                                &j, NULL);
+                gtmp = X509_REVOKED_get_ext_d2i(rev, NID_certificate_issuer,
+                    &j, NULL);
                 if (!gtmp && (j != -1)) {
                         crl->flags |= EXFLAG_INVALID;
                         return 1;
@@ -159,7 +159,7 @@ static int crl_set_issuers(X509_CRL *crl)
                 rev->issuer = gens;
 
                 reason = X509_REVOKED_get_ext_d2i(rev, NID_crl_reason,
-                                                                &j, NULL);
+                    &j, NULL);
                 if (!reason && (j != -1)) {
                         crl->flags |= EXFLAG_INVALID;
                         return 1;
@@ -169,7 +169,7 @@ static int crl_set_issuers(X509_CRL *crl)
                         rev->reason = ASN1_ENUMERATED_get(reason);
                         ASN1_ENUMERATED_free(reason);
                 } else
-                        rev->reason = CRL_REASON_NONE;  
+                        rev->reason = CRL_REASON_NONE;
 
                 /* Check for critical CRL entry extensions */
 
@@ -179,32 +179,29 @@ static int crl_set_issuers(X509_CRL *crl)
                         ext = sk_X509_EXTENSION_value(exts, j);
                         if (ext->critical > 0) {
                                 if (OBJ_obj2nid(ext->object) ==
-                                        NID_certificate_issuer)
+                                    NID_certificate_issuer)
                                         continue;
                                 crl->flags |= EXFLAG_CRITICAL;
                                 break;
                         }
                 }
-
-
         }
 
         return 1;
-
 }
 
 /* The X509_CRL structure needs a bit of customisation. Cache some extensions
  * and hash of the whole CRL.
  */
-static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                                                void *exarg)
+static int
+crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 {
         X509_CRL *crl = (X509_CRL *)*pval;
         STACK_OF(X509_EXTENSION) *exts;
         X509_EXTENSION *ext;
         int idx;
 
-        switch(operation) {
+        switch (operation) {
         case ASN1_OP_NEW_POST:
                 crl->idp = NULL;
                 crl->akid = NULL;
@@ -223,23 +220,23 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
                 X509_CRL_digest(crl, EVP_sha1(), crl->sha1_hash, NULL);
 #endif
                 crl->idp = X509_CRL_get_ext_d2i(crl,
-                                NID_issuing_distribution_point, NULL, NULL);
+                    NID_issuing_distribution_point, NULL, NULL);
                 if (crl->idp)
                         setup_idp(crl, crl->idp);
 
                 crl->akid = X509_CRL_get_ext_d2i(crl,
-                                NID_authority_key_identifier, NULL, NULL);      
+                    NID_authority_key_identifier, NULL, NULL);
 
                 crl->crl_number = X509_CRL_get_ext_d2i(crl,
-                                NID_crl_number, NULL, NULL);    
+                    NID_crl_number, NULL, NULL);
 
                 crl->base_crl_number = X509_CRL_get_ext_d2i(crl,
-                                NID_delta_crl, NULL, NULL);     
+                    NID_delta_crl, NULL, NULL);
                 /* Delta CRLs must have CRL number */
                 if (crl->base_crl_number && !crl->crl_number)
                         crl->flags |= EXFLAG_INVALID;
 
-                /* See if we have any unhandled critical CRL extensions and 
+                /* See if we have any unhandled critical CRL extensions and
                  * indicate this in a flag. We only currently handle IDP so
                  * anything else critical sets the flag.
                  *
@@ -257,15 +254,14 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
                                 crl->flags |= EXFLAG_FRESHEST;
                         if (ext->critical > 0) {
                                 /* We handle IDP and deltas */
-                                if ((nid == NID_issuing_distribution_point)
-                                        || (nid == NID_delta_crl))
+                                if ((nid == NID_issuing_distribution_point) ||
+                                    (nid == NID_delta_crl))
                                         break;;
                                 crl->flags |= EXFLAG_CRITICAL;
                                 break;
                         }
                 }
 
-
                 if (!crl_set_issuers(crl))
                         return 0;
 
@@ -294,9 +290,11 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 
 /* Convert IDP into a more convenient form */
 
-static void setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp)
+static void
+setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp)
 {
         int idp_only = 0;
+
         /* Set various flags according to IDP */
         crl->idp_flags |= IDP_PRESENT;
         if (idp->onlyuser > 0) {
@@ -324,7 +322,7 @@ static void setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp)
                         crl->idp_reasons = idp->onlysomereasons->data[0];
                 if (idp->onlysomereasons->length > 1)
                         crl->idp_reasons |=
-                                (idp->onlysomereasons->data[1] << 8);
+                            (idp->onlysomereasons->data[1] << 8);
                 crl->idp_reasons &= CRLDP_ALL_REASONS;
         }
 
@@ -342,60 +340,65 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_CRL_INFO)
 IMPLEMENT_ASN1_FUNCTIONS(X509_CRL)
 IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL)
 
-static int X509_REVOKED_cmp(const X509_REVOKED * const *a,
-                        const X509_REVOKED * const *b)
+static int
+X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b)
 {
         return(ASN1_STRING_cmp(
-                (ASN1_STRING *)(*a)->serialNumber,
-                (ASN1_STRING *)(*b)->serialNumber));
+            (ASN1_STRING *)(*a)->serialNumber,
+            (ASN1_STRING *)(*b)->serialNumber));
 }
 
-int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev)
+int
+X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev)
 {
         X509_CRL_INFO *inf;
+
         inf = crl->crl;
-        if(!inf->revoked)
+        if (!inf->revoked)
                 inf->revoked = sk_X509_REVOKED_new(X509_REVOKED_cmp);
-        if(!inf->revoked || !sk_X509_REVOKED_push(inf->revoked, rev)) {
+        if (!inf->revoked || !sk_X509_REVOKED_push(inf->revoked, rev)) {
                 ASN1err(ASN1_F_X509_CRL_ADD0_REVOKED, ERR_R_MALLOC_FAILURE);
                 return 0;
-}
+        }
         inf->enc.modified = 1;
         return 1;
 }
 
-int X509_CRL_verify(X509_CRL *crl, EVP_PKEY *r)
+int
+X509_CRL_verify(X509_CRL *crl, EVP_PKEY *r)
 {
         if (crl->meth->crl_verify)
                 return crl->meth->crl_verify(crl, r);
         return 0;
 }
 
-int X509_CRL_get0_by_serial(X509_CRL *crl,
-                X509_REVOKED **ret, ASN1_INTEGER *serial)
+int
+X509_CRL_get0_by_serial(X509_CRL *crl, X509_REVOKED **ret,
+    ASN1_INTEGER *serial)
 {
         if (crl->meth->crl_lookup)
                 return crl->meth->crl_lookup(crl, ret, serial, NULL);
         return 0;
 }
 
-int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x)
+int
+X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x)
 {
         if (crl->meth->crl_lookup)
                 return crl->meth->crl_lookup(crl, ret,
-                                                X509_get_serialNumber(x),
-                                                X509_get_issuer_name(x));
+                    X509_get_serialNumber(x), X509_get_issuer_name(x));
         return 0;
 }
 
-static int def_crl_verify(X509_CRL *crl, EVP_PKEY *r)
+static int
+def_crl_verify(X509_CRL *crl, EVP_PKEY *r)
 {
         return(ASN1_item_verify(ASN1_ITEM_rptr(X509_CRL_INFO),
-                crl->sig_alg, crl->signature,crl->crl,r));
+            crl->sig_alg, crl->signature, crl->crl, r));
 }
 
-static int crl_revoked_issuer_match(X509_CRL *crl, X509_NAME *nm,
-                                                X509_REVOKED *rev)
+static int
+crl_revoked_issuer_match(X509_CRL *crl, X509_NAME *nm, X509_REVOKED *rev)
 {
         int i;
 
@@ -421,11 +424,13 @@ static int crl_revoked_issuer_match(X509_CRL *crl, X509_NAME *nm,
 
 }
 
-static int def_crl_lookup(X509_CRL *crl,
-                X509_REVOKED **ret, ASN1_INTEGER *serial, X509_NAME *issuer)
+static int
+def_crl_lookup(X509_CRL *crl, X509_REVOKED **ret, ASN1_INTEGER *serial,
+    X509_NAME *issuer)
 {
         X509_REVOKED rtmp, *rev;
         int idx;
+
         rtmp.serialNumber = serial;
         /* Sort revoked into serial number order if not already sorted.
          * Do this under a lock to avoid race condition.
@@ -436,10 +441,10 @@ static int def_crl_lookup(X509_CRL *crl,
                 CRYPTO_w_unlock(CRYPTO_LOCK_X509_CRL);
         }
         idx = sk_X509_REVOKED_find(crl->crl->revoked, &rtmp);
-        if(idx < 0)
+        if (idx < 0)
                 return 0;
         /* Need to look for matching name */
-        for(;idx < sk_X509_REVOKED_num(crl->crl->revoked); idx++) {
+        for (; idx < sk_X509_REVOKED_num(crl->crl->revoked); idx++) {
                 rev = sk_X509_REVOKED_value(crl->crl->revoked, idx);
                 if (ASN1_INTEGER_cmp(rev->serialNumber, serial))
                         return 0;
@@ -454,22 +459,24 @@ static int def_crl_lookup(X509_CRL *crl,
         return 0;
 }
 
-void X509_CRL_set_default_method(const X509_CRL_METHOD *meth)
+void
+X509_CRL_set_default_method(const X509_CRL_METHOD *meth)
 {
         if (meth == NULL)
                 default_crl_method = &int_crl_meth;
-        else 
+        else
                 default_crl_method = meth;
 }
 
-X509_CRL_METHOD *X509_CRL_METHOD_new(
-        int (*crl_init)(X509_CRL *crl),
-        int (*crl_free)(X509_CRL *crl),
-        int (*crl_lookup)(X509_CRL *crl, X509_REVOKED **ret,
-                                ASN1_INTEGER *ser, X509_NAME *issuer),
-        int (*crl_verify)(X509_CRL *crl, EVP_PKEY *pk))
+X509_CRL_METHOD *
+X509_CRL_METHOD_new(int (*crl_init)(X509_CRL *crl),
+    int (*crl_free)(X509_CRL *crl),
+    int (*crl_lookup)(X509_CRL *crl, X509_REVOKED **ret,
+    ASN1_INTEGER *ser, X509_NAME *issuer),
+    int (*crl_verify)(X509_CRL *crl, EVP_PKEY *pk))
 {
         X509_CRL_METHOD *m;
+
         m = malloc(sizeof(X509_CRL_METHOD));
         if (!m)
                 return NULL;
@@ -481,19 +488,22 @@ X509_CRL_METHOD *X509_CRL_METHOD_new(
         return m;
 }
 
-void X509_CRL_METHOD_free(X509_CRL_METHOD *m)
+void
+X509_CRL_METHOD_free(X509_CRL_METHOD *m)
 {
         if (!(m->flags & X509_CRL_METHOD_DYNAMIC))
                 return;
         free(m);
 }
 
-void X509_CRL_set_meth_data(X509_CRL *crl, void *dat)
+void
+X509_CRL_set_meth_data(X509_CRL *crl, void *dat)
 {
         crl->meth_data = dat;
 }
 
-void *X509_CRL_get_meth_data(X509_CRL *crl)
+void *
+X509_CRL_get_meth_data(X509_CRL *crl)
 {
         return crl->meth_data;
 }