Beautifying. Sorry, but code that's slammed to the far left is not

[openssl.git] / crypto / pkcs12 / p12_kiss.c

diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index 767e1303da90eaf991509a58f4f1abbf07f7c05d..9f8f9828108c26790f4a3d29c06f5eabd7288414 100644 (file)
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -75,44 +75,49 @@ int PKCS12_parse (PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
             STACK **ca)
 {
 
-/* Check for NULL PKCS12 structure */
+       /* Check for NULL PKCS12 structure */
 
-if(!p12) {
-       PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_INVALID_NULL_PKCS12_POINTER);
-       return 0;
-}
-
-/* Allocate stack for ca certificates if needed */
-if ((ca != NULL) && (*ca == NULL)) {
-       if (!(*ca = sk_new(NULL))) {
-               PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE);
+       if(!p12)
+               {
+               PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_INVALID_NULL_PKCS12_POINTER);
                return 0;
-       }
-}
+               }
+
+       /* Allocate stack for ca certificates if needed */
+       if ((ca != NULL) && (*ca == NULL))
+               {
+               if (!(*ca = sk_new(NULL)))
+                       {
+                       PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE);
+                       return 0;
+                       }
+               }
 
-if(pkey) *pkey = NULL;
-if(cert) *cert = NULL;
+       if(pkey) *pkey = NULL;
+       if(cert) *cert = NULL;
 
-/* Check the mac */
+       /* Check the mac */
 
-if (!PKCS12_verify_mac (p12, pass, -1)) {
-       PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE);
-       goto err;
-}
+       if (!PKCS12_verify_mac (p12, pass, -1))
+               {
+               PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE);
+               goto err;
+               }
 
-if (!parse_pk12 (p12, pass, -1, pkey, cert, ca)) {
-       PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_PARSE_ERROR);
-       goto err;
-}
+       if (!parse_pk12 (p12, pass, -1, pkey, cert, ca))
+               {
+               PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_PARSE_ERROR);
+               goto err;
+               }
 
-return 1;
+       return 1;
 
-err:
+ err:
 
-if (pkey && *pkey) EVP_PKEY_free (*pkey);
-if (cert && *cert) X509_free (*cert);
-if (ca) sk_pop_free (*ca, X509_free);
-return 0;
+       if (pkey && *pkey) EVP_PKEY_free (*pkey);
+       if (cert && *cert) X509_free (*cert);
+       if (ca) sk_pop_free (*ca, X509_free);
+       return 0;
 
 }
 
@@ -139,16 +144,16 @@ static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen,
                        sk_pop_free (asafes, PKCS7_free);
                        return 0;
                }
-               if (!parse_bags (bags, pass, passlen, pkey, cert, ca,
+               if (!parse_bags(bags, pass, passlen, pkey, cert, ca,
                                                         &keyid, &keymatch)) {
-                       sk_pop_free (bags, PKCS12_SAFEBAG_free);
-                       sk_pop_free (asafes, PKCS7_free);
+                       sk_pop_free(bags, PKCS12_SAFEBAG_free);
+                       sk_pop_free(asafes, PKCS7_free);
                        return 0;
                }
-               sk_pop_free (bags, PKCS12_SAFEBAG_free);
+               sk_pop_free(bags, PKCS12_SAFEBAG_free);
        }
-       sk_pop_free (asafes, PKCS7_free);
-       if (keyid) ASN1_OCTET_STRING_free (keyid);
+       sk_pop_free(asafes, PKCS7_free);
+       if (keyid) M_ASN1_OCTET_STRING_free(keyid);
        return 1;
 }
 
@@ -158,8 +163,8 @@ static int parse_bags (STACK *bags, const char *pass, int passlen,
                       ASN1_OCTET_STRING **keyid, char *keymatch)
 {
        int i;
-       for (i = 0; i < sk_num (bags); i++) {
-               if (!parse_bag ((PKCS12_SAFEBAG *)sk_value (bags, i),
+       for (i = 0; i < sk_num(bags); i++) {
+               if (!parse_bag((PKCS12_SAFEBAG *)sk_value (bags, i),
                         pass, passlen, pkey, cert, ca, keyid,
                                                         keymatch)) return 0;
        }
@@ -170,7 +175,7 @@ static int parse_bags (STACK *bags, const char *pass, int passlen,
 #define MATCH_CERT 0x2
 #define MATCH_ALL  0x3
 
-static int parse_bag (PKCS12_SAFEBAG *bag, const char *pass, int passlen,
+static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
                      EVP_PKEY **pkey, X509 **cert, STACK **ca,
                      ASN1_OCTET_STRING **keyid,
             char *keymatch)
@@ -187,9 +192,9 @@ static int parse_bag (PKCS12_SAFEBAG *bag, const char *pass, int passlen,
        /* Check for any local key id matching (if needed) */
        if (lkey && ((*keymatch & MATCH_ALL) != MATCH_ALL)) {
                if (*keyid) {
-                       if (ASN1_OCTET_STRING_cmp (*keyid, lkey)) lkey = NULL;
+                       if (M_ASN1_OCTET_STRING_cmp(*keyid, lkey)) lkey = NULL;
                } else {
-                       if (!(*keyid = ASN1_OCTET_STRING_dup (lkey))) {
+                       if (!(*keyid = M_ASN1_OCTET_STRING_dup(lkey))) {
                                PKCS12err(PKCS12_F_PARSE_BAGS,ERR_R_MALLOC_FAILURE);
                                return 0;
                    }
@@ -200,16 +205,16 @@ static int parse_bag (PKCS12_SAFEBAG *bag, const char *pass, int passlen,
        {
        case NID_keyBag:
                if (!lkey || !pkey) return 1;   
-               if (!(*pkey = EVP_PKCS82PKEY (bag->value.keybag))) return 0;
+               if (!(*pkey = EVP_PKCS82PKEY(bag->value.keybag))) return 0;
                *keymatch |= MATCH_KEY;
        break;
 
        case NID_pkcs8ShroudedKeyBag:
                if (!lkey || !pkey) return 1;   
-               if (!(p8 = M_PKCS12_decrypt_skey (bag, pass, passlen)))
+               if (!(p8 = M_PKCS12_decrypt_skey(bag, pass, passlen)))
                                return 0;
-               *pkey = EVP_PKCS82PKEY (p8);
-               PKCS8_PRIV_KEY_INFO_free (p8);
+               *pkey = EVP_PKCS82PKEY(p8);
+               PKCS8_PRIV_KEY_INFO_free(p8);
                if (!(*pkey)) return 0;
                *keymatch |= MATCH_KEY;
        break;