1 files changed, 73 insertions, 77 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c
index 0772fa65af..4063ba4b82 100644
--- a/src/lib/libcrypto/pkcs12/p12_kiss.c
+++ b/src/lib/libcrypto/pkcs12/p12_kiss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_kiss.c,v 1.14 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: p12_kiss.c,v 1.15 2014/07/08 09:24:53 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -10,7 +10,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
@@ -63,13 +63,13 @@
 /* Simplified PKCS#12 routines */
 
 static int parse_pk12( PKCS12 *p12, const char *pass, int passlen,
-                EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
+    EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
 
 static int parse_bags( STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,
-                       int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
+    int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
 
 static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen,
-                        EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
+    EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
 
 /* Parse and decrypt a PKCS#12 structure returning user key, user cert
  * and other (CA) certs. Note either ca should be NULL, *ca should be NULL,
@@ -77,22 +77,23 @@ static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen,
  * passed unitialised.
  */
 
-int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
-             STACK_OF(X509) **ca)
+int
+PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
+    STACK_OF(X509) **ca)
 {
         STACK_OF(X509) *ocerts = NULL;
         X509 *x = NULL;
         /* Check for NULL PKCS12 structure */
 
-        if(!p12)
-                {
-                PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_INVALID_NULL_PKCS12_POINTER);
+        if (!p12) {
+                PKCS12err(PKCS12_F_PKCS12_PARSE,
+                    PKCS12_R_INVALID_NULL_PKCS12_POINTER);
                 return 0;
-                }
+        }
 
-        if(pkey)
+        if (pkey)
                 *pkey = NULL;
-        if(cert)
+        if (cert)
                 *cert = NULL;
 
         /* Check the mac */
@@ -103,46 +104,42 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
          * password are two different things...
          */
 
-        if(!pass || !*pass) {
-                if(PKCS12_verify_mac(p12, NULL, 0)) pass = NULL;
-                else if(PKCS12_verify_mac(p12, "", 0)) pass = "";
+        if (!pass || !*pass) {
+                if (PKCS12_verify_mac(p12, NULL, 0))
+                        pass = NULL;
+                else if (PKCS12_verify_mac(p12, "", 0))
+                        pass = "";
                 else {
-                        PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE);
+                        PKCS12err(PKCS12_F_PKCS12_PARSE,
+                            PKCS12_R_MAC_VERIFY_FAILURE);
                         goto err;
                 }
         } else if (!PKCS12_verify_mac(p12, pass, -1)) {
-                PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE);
+                PKCS12err(PKCS12_F_PKCS12_PARSE, PKCS12_R_MAC_VERIFY_FAILURE);
                 goto err;
         }
 
         /* Allocate stack for other certificates */
         ocerts = sk_X509_new_null();
-
-        if (!ocerts)
-                {
-                PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE);
+        if (!ocerts) {
+                PKCS12err(PKCS12_F_PKCS12_PARSE, ERR_R_MALLOC_FAILURE);
                 return 0;
-                }
+        }
 
-        if (!parse_pk12 (p12, pass, -1, pkey, ocerts))
-                {
-                PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_PARSE_ERROR);
+        if (!parse_pk12 (p12, pass, -1, pkey, ocerts)) {
+                PKCS12err(PKCS12_F_PKCS12_PARSE, PKCS12_R_PARSE_ERROR);
                 goto err;
-                }
+        }
 
-        while ((x = sk_X509_pop(ocerts)))
-                {
-                if (pkey && *pkey && cert && !*cert)
-                        {
-                        if (X509_check_private_key(x, *pkey))
-                                {
+        while ((x = sk_X509_pop(ocerts))) {
+                if (pkey && *pkey && cert && !*cert) {
+                        if (X509_check_private_key(x, *pkey)) {
                                 *cert = x;
                                 x = NULL;
-                                }
                         }
+                }
 
-                if (ca && x)
-                        {
+                if (ca && x) {
                         if (!*ca)
                                 *ca = sk_X509_new_null();
                         if (!*ca)
@@ -150,18 +147,17 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
                         if (!sk_X509_push(*ca, x))
                                 goto err;
                         x = NULL;
-                        }
+                }
                 if (x)
                         X509_free(x);
-                }
+        }
 
         if (ocerts)
                 sk_X509_pop_free(ocerts, X509_free);
 
         return 1;
 
- err:
-
+err:
         if (pkey && *pkey)
                 EVP_PKEY_free(*pkey);
         if (cert && *cert)
@@ -171,20 +167,21 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
         if (ocerts)
                 sk_X509_pop_free(ocerts, X509_free);
         return 0;
-
 }
 
 /* Parse the outer PKCS#12 structure */
 
-static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
-             EVP_PKEY **pkey, STACK_OF(X509) *ocerts)
+static int
+parse_pk12(PKCS12 *p12, const char *pass, int passlen, EVP_PKEY **pkey,
+    STACK_OF(X509) *ocerts)
 {
         STACK_OF(PKCS7) *asafes;
         STACK_OF(PKCS12_SAFEBAG) *bags;
         int i, bagnid;
         PKCS7 *p7;
 
-        if (!(asafes = PKCS12_unpack_authsafes (p12))) return 0;
+        if (!(asafes = PKCS12_unpack_authsafes (p12)))
+                return 0;
         for (i = 0; i < sk_PKCS7_num (asafes); i++) {
                 p7 = sk_PKCS7_value (asafes, i);
                 bagnid = OBJ_obj2nid (p7->type);
@@ -192,12 +189,13 @@ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
                         bags = PKCS12_unpack_p7data(p7);
                 } else if (bagnid == NID_pkcs7_encrypted) {
                         bags = PKCS12_unpack_p7encdata(p7, pass, passlen);
-                } else continue;
+                } else
+                        continue;
                 if (!bags) {
                         sk_PKCS7_pop_free(asafes, PKCS7_free);
                         return 0;
                 }
-                if (!parse_bags(bags, pass, passlen, pkey, ocerts)) {
+                if (!parse_bags(bags, pass, passlen, pkey, ocerts)) {
                         sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
                         sk_PKCS7_pop_free(asafes, PKCS7_free);
                         return 0;
@@ -208,21 +206,23 @@ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
         return 1;
 }
 
-
-static int parse_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,
-                      int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts)
+static int
+parse_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass, int passlen,
+    EVP_PKEY **pkey, STACK_OF(X509) *ocerts)
 {
         int i;
+
         for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
-                if (!parse_bag(sk_PKCS12_SAFEBAG_value (bags, i),
-                                 pass, passlen, pkey, ocerts))
+                if (!parse_bag(sk_PKCS12_SAFEBAG_value(bags, i), pass, passlen,
+                    pkey, ocerts))
                         return 0;
         }
         return 1;
 }
 
-static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
-                     EVP_PKEY **pkey, STACK_OF(X509) *ocerts)
+static int
+parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey,
+    STACK_OF(X509) *ocerts)
 {
         PKCS8_PRIV_KEY_INFO *p8;
         X509 *x509;
@@ -236,67 +236,63 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
         if ((attrib = PKCS12_get_attr (bag, NID_localKeyID)))
                 lkid = attrib->value.octet_string;
 
-        switch (M_PKCS12_bag_type(bag))
-        {
+        switch (M_PKCS12_bag_type(bag)) {
         case NID_keyBag:
                 if (!pkey || *pkey)
-                        return 1;       
+                        return 1;
                 if (!(*pkey = EVP_PKCS82PKEY(bag->value.keybag)))
                         return 0;
-        break;
+                break;
 
         case NID_pkcs8ShroudedKeyBag:
                 if (!pkey || *pkey)
-                        return 1;       
+                        return 1;
                 if (!(p8 = PKCS12_decrypt_skey(bag, pass, passlen)))
-                                return 0;
+                        return 0;
                 *pkey = EVP_PKCS82PKEY(p8);
                 PKCS8_PRIV_KEY_INFO_free(p8);
-                if (!(*pkey)) return 0;
-        break;
+                if (!(*pkey))
+                        return 0;
+                break;
 
         case NID_certBag:
                 if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate )
                         return 1;
                 if (!(x509 = PKCS12_certbag2x509(bag)))
                         return 0;
-                if(lkid && !X509_keyid_set1(x509, lkid->data, lkid->length))
-                        {
+                if (lkid && !X509_keyid_set1(x509, lkid->data, lkid->length)) {
                         X509_free(x509);
                         return 0;
-                        }
-                if(fname) {
+                }
+                if (fname) {
                         int len, r;
                         unsigned char *data;
                         len = ASN1_STRING_to_UTF8(&data, fname);
-                        if(len >= 0) {
+                        if (len >= 0) {
                                 r = X509_alias_set1(x509, data, len);
                                 free(data);
-                                if (!r)
-                                        {
+                                if (!r) {
                                         X509_free(x509);
                                         return 0;
-                                        }
+                                }
                         }
                 }
 
-                if(!sk_X509_push(ocerts, x509))
-                        {
+                if (!sk_X509_push(ocerts, x509)) {
                         X509_free(x509);
                         return 0;
-                        }
+                }
 
-        break;
+                break;
 
         case NID_safeContentsBag:
                 return parse_bags(bag->value.safes, pass, passlen,
-                                        pkey, ocerts);
-        break;
+                    pkey, ocerts);
+                break;
 
         default:
                 return 1;
-        break;
+                break;
         }
         return 1;
 }
-