1 files changed, 87 insertions, 104 deletions

diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_crt.c b/src/lib/libssl/src/crypto/pkcs12/p12_crt.c
index a5dffcebd7..538637e78a 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_crt.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_crt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_crt.c,v 1.13 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: p12_crt.c,v 1.14 2014/07/08 09:24:53 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -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
@@ -61,12 +61,15 @@
 #include <openssl/pkcs12.h>
 
 
-static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag);
+static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
+    PKCS12_SAFEBAG *bag);
 
-static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
-        {
+static int
+copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
+{
         int idx;
         X509_ATTRIBUTE *attr;
+
         idx = EVP_PKEY_get_attr_by_NID(pkey, nid, -1);
         if (idx < 0)
                 return 1;
@@ -74,11 +77,12 @@ static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
         if (!X509at_add1_attr(&bag->attrib, attr))
                 return 0;
         return 1;
-        }
+}
 
-PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
-             STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, int mac_iter,
-             int keytype)
+PKCS12 *
+PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
+    STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter, int mac_iter,
+    int keytype)
 {
         PKCS12 *p12 = NULL;
         STACK_OF(PKCS7) *safes = NULL;
@@ -89,10 +93,9 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
         unsigned int keyidlen = 0;
 
         /* Set defaults */
-        if (!nid_cert)
-                {
+        if (!nid_cert) {
                 nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
-                }
+        }
         if (!nid_key)
                 nid_key = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
         if (!iter)
@@ -100,43 +103,39 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
         if (!mac_iter)
                 mac_iter = 1;
 
-        if(!pkey && !cert && !ca)
-                {
-                PKCS12err(PKCS12_F_PKCS12_CREATE,PKCS12_R_INVALID_NULL_ARGUMENT);
+        if (!pkey && !cert && !ca) {
+                PKCS12err(PKCS12_F_PKCS12_CREATE,
+                    PKCS12_R_INVALID_NULL_ARGUMENT);
                 return NULL;
-                }
+        }
 
-        if (pkey && cert)
-                {
-                if(!X509_check_private_key(cert, pkey))
+        if (pkey && cert) {
+                if (!X509_check_private_key(cert, pkey))
                         return NULL;
                 X509_digest(cert, EVP_sha1(), keyid, &keyidlen);
-                }
+        }
 
-        if (cert)
-                {
+        if (cert) {
                 bag = PKCS12_add_cert(&bags, cert);
-                if(name && !PKCS12_add_friendlyname(bag, name, -1))
+                if (name && !PKCS12_add_friendlyname(bag, name, -1))
                         goto err;
-                if(keyidlen && !PKCS12_add_localkeyid(bag, keyid, keyidlen))
+                if (keyidlen && !PKCS12_add_localkeyid(bag, keyid, keyidlen))
                         goto err;
-                }
+        }
 
         /* Add all other certificates */
-        for(i = 0; i < sk_X509_num(ca); i++)
-                {
+        for (i = 0; i < sk_X509_num(ca); i++) {
                 if (!PKCS12_add_cert(&bags, sk_X509_value(ca, i)))
                         goto err;
-                }
+        }
 
         if (bags && !PKCS12_add_safe(&safes, bags, nid_cert, iter, pass))
-                        goto err;
+                goto err;
 
         sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
         bags = NULL;
 
-        if (pkey)
-                {
+        if (pkey) {
                 bag = PKCS12_add_key(&bags, pkey, keytype, iter, nid_key, pass);
 
                 if (!bag)
@@ -147,14 +146,14 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
                 if (!copy_bag_attr(bag, pkey, NID_LocalKeySet))
                         goto err;
 
-                if(name && !PKCS12_add_friendlyname(bag, name, -1))
+                if (name && !PKCS12_add_friendlyname(bag, name, -1))
                         goto err;
-                if(keyidlen && !PKCS12_add_localkeyid(bag, keyid, keyidlen))
+                if (keyidlen && !PKCS12_add_localkeyid(bag, keyid, keyidlen))
                         goto err;
-                }
+        }
 
         if (bags && !PKCS12_add_safe(&safes, bags, -1, 0, NULL))
-                        goto err;
+                goto err;
 
         sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
         bags = NULL;
@@ -169,13 +168,12 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
         safes = NULL;
 
         if ((mac_iter != -1) &&
-                !PKCS12_set_mac(p12, pass, -1, NULL, 0, mac_iter, NULL))
-            goto err;
+            !PKCS12_set_mac(p12, pass, -1, NULL, 0, mac_iter, NULL))
+                goto err;
 
         return p12;
 
-        err:
-
+err:
         if (p12)
                 PKCS12_free(p12);
         if (safes)
@@ -183,11 +181,11 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
         if (bags)
                 sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
         return NULL;
-
 }
 
-PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
-        {
+PKCS12_SAFEBAG *
+PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
+{
         PKCS12_SAFEBAG *bag = NULL;
         char *name;
         int namelen = -1;
@@ -195,21 +193,19 @@ PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
         int keyidlen = -1;
 
         /* Add user certificate */
-        if(!(bag = PKCS12_x5092certbag(cert)))
+        if (!(bag = PKCS12_x5092certbag(cert)))
                 goto err;
 
         /* Use friendlyName and localKeyID in certificate.
          * (if present)
          */
-
         name = (char *)X509_alias_get0(cert, &namelen);
-
-        if(name && !PKCS12_add_friendlyname(bag, name, namelen))
+        if (name && !PKCS12_add_friendlyname(bag, name, namelen))
                 goto err;
 
         keyid = X509_keyid_get0(cert, &keyidlen);
 
-        if(keyid && !PKCS12_add_localkeyid(bag, keyid, keyidlen))
+        if (keyid && !PKCS12_add_localkeyid(bag, keyid, keyidlen))
                 goto err;
 
         if (!pkcs12_add_bag(pbags, bag))
@@ -217,37 +213,33 @@ PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
 
         return bag;
 
-        err:
-
+err:
         if (bag)
                 PKCS12_SAFEBAG_free(bag);
 
         return NULL;
+}
 
-        }
-
-PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key,
-                                                int key_usage, int iter,
-                                                int nid_key, char *pass)
-        {
-
+PKCS12_SAFEBAG *
+PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key, int key_usage,
+    int iter, int nid_key, char *pass)
+{
         PKCS12_SAFEBAG *bag = NULL;
         PKCS8_PRIV_KEY_INFO *p8 = NULL;
 
         /* Make a PKCS#8 structure */
-        if(!(p8 = EVP_PKEY2PKCS8(key)))
+        if (!(p8 = EVP_PKEY2PKCS8(key)))
                 goto err;
-        if(key_usage && !PKCS8_add_keyusage(p8, key_usage))
+        if (key_usage && !PKCS8_add_keyusage(p8, key_usage))
                 goto err;
-        if (nid_key != -1)
-                {
-                bag = PKCS12_MAKE_SHKEYBAG(nid_key, pass, -1, NULL, 0, iter, p8);
+        if (nid_key != -1) {
+                bag = PKCS12_MAKE_SHKEYBAG(nid_key, pass, -1, NULL, 0,
+                    iter, p8);
                 PKCS8_PRIV_KEY_INFO_free(p8);
-                }
-        else
+        } else
                 bag = PKCS12_MAKE_KEYBAG(p8);
 
-        if(!bag)
+        if (!bag)
                 goto err;
 
         if (!pkcs12_add_bag(pbags, bag))
@@ -255,29 +247,26 @@ PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags, EVP_PKEY *key,
 
         return bag;
 
-        err:
-
+err:
         if (bag)
                 PKCS12_SAFEBAG_free(bag);
 
         return NULL;
+}
 
-        }
-
-int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
-                                                int nid_safe, int iter, char *pass)
-        {
+int
+PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
+    int nid_safe, int iter, char *pass)
+{
         PKCS7 *p7 = NULL;
         int free_safes = 0;
 
-        if (!*psafes)
-                {
+        if (!*psafes) {
                 *psafes = sk_PKCS7_new_null();
                 if (!*psafes)
                         return 0;
                 free_safes = 1;
-                }
-        else
+        } else
                 free_safes = 0;
 
         if (nid_safe == 0)
@@ -287,7 +276,7 @@ int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
                 p7 = PKCS12_pack_p7data(bags);
         else
                 p7 = PKCS12_pack_p7encdata(nid_safe, pass, -1, NULL, 0,
-                                          iter, bags);
+                    iter, bags);
         if (!p7)
                 goto err;
 
@@ -296,53 +285,49 @@ int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
 
         return 1;
 
-        err:
-        if (free_safes)
-                {
+err:
+        if (free_safes) {
                 sk_PKCS7_free(*psafes);
                 *psafes = NULL;
-                }
+        }
 
         if (p7)
                 PKCS7_free(p7);
 
         return 0;
+}
 
-        }
-
-static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag)
-        {
+static int
+pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag)
+{
         int free_bags;
+
         if (!pbags)
                 return 1;
-        if (!*pbags)
-                {
+        if (!*pbags) {
                 *pbags = sk_PKCS12_SAFEBAG_new_null();
                 if (!*pbags)
                         return 0;
                 free_bags = 1;
-                }
-        else 
+        } else
                 free_bags = 0;
 
-        if (!sk_PKCS12_SAFEBAG_push(*pbags, bag))
-                {
-                if (free_bags)
-                        {
+        if (!sk_PKCS12_SAFEBAG_push(*pbags, bag)) {
+                if (free_bags) {
                         sk_PKCS12_SAFEBAG_free(*pbags);
                         *pbags = NULL;
-                        }
-                return 0;
                 }
+                return 0;
+        }
 
         return 1;
+}
 
-        }
-                
-
-PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int nid_p7)
-        {
+PKCS12 *
+PKCS12_add_safes(STACK_OF(PKCS7) *safes, int nid_p7)
+{
         PKCS12 *p12;
+
         if (nid_p7 <= 0)
                 nid_p7 = NID_pkcs7_data;
         p12 = PKCS12_init(nid_p7);
@@ -350,12 +335,10 @@ PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int nid_p7)
         if (!p12)
                 return NULL;
 
-        if(!PKCS12_pack_authsafes(p12, safes))
-                {
+        if (!PKCS12_pack_authsafes(p12, safes)) {
                 PKCS12_free(p12);
                 return NULL;
-                }
+        }
 
         return p12;
-
-        }
+}