1 files changed, 18 insertions, 14 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_init.c b/src/lib/libcrypto/pkcs12/p12_init.c
index e9c55ea265..b4da7be77c 100644
--- a/src/lib/libcrypto/pkcs12/p12_init.c
+++ b/src/lib/libcrypto/pkcs12/p12_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_init.c,v 1.7 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: p12_init.c,v 1.8 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
@@ -62,31 +62,35 @@
 
 /* Initialise a PKCS12 structure to take data */
 
-PKCS12 *PKCS12_init(int mode)
+PKCS12 *
+PKCS12_init(int mode)
 {
         PKCS12 *pkcs12;
+
         if (!(pkcs12 = PKCS12_new())) {
-                PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
+                PKCS12err(PKCS12_F_PKCS12_INIT, ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         ASN1_INTEGER_set(pkcs12->version, 3);
         pkcs12->authsafes->type = OBJ_nid2obj(mode);
         switch (mode) {
-                case NID_pkcs7_data:
-                        if (!(pkcs12->authsafes->d.data =
-                                 M_ASN1_OCTET_STRING_new())) {
-                        PKCS12err(PKCS12_F_PKCS12_INIT,ERR_R_MALLOC_FAILURE);
+        case NID_pkcs7_data:
+                if (!(pkcs12->authsafes->d.data =
+                    M_ASN1_OCTET_STRING_new())) {
+                        PKCS12err(PKCS12_F_PKCS12_INIT, ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 break;
-                default:
-                        PKCS12err(PKCS12_F_PKCS12_INIT,
-                                PKCS12_R_UNSUPPORTED_PKCS12_MODE);
-                        goto err;
+        default:
+                PKCS12err(PKCS12_F_PKCS12_INIT,
+                    PKCS12_R_UNSUPPORTED_PKCS12_MODE);
+                goto err;
         }
-                
+
         return pkcs12;
+
 err:
-        if (pkcs12 != NULL) PKCS12_free(pkcs12);
+        if (pkcs12 != NULL)
+                PKCS12_free(pkcs12);
         return NULL;
 }