1 files changed, 36 insertions, 30 deletions

diff --git a/src/lib/libcrypto/asn1/d2i_pr.c b/src/lib/libcrypto/asn1/d2i_pr.c
index 5e6003ca5b..c356e3fda5 100644
--- a/src/lib/libcrypto/asn1/d2i_pr.c
+++ b/src/lib/libcrypto/asn1/d2i_pr.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
@@ -68,18 +68,18 @@
 #include <openssl/asn1.h>
 #include "asn1_locl.h"
 
-EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
-             long length)
+EVP_PKEY *
+d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp, long length)
 {
         EVP_PKEY *ret;
 
         if ((a == NULL) || (*a == NULL)) {
-                if ((ret=EVP_PKEY_new()) == NULL) {
-                        ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_EVP_LIB);
-                        return(NULL);
+                if ((ret = EVP_PKEY_new()) == NULL) {
+                        ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_EVP_LIB);
+                        return (NULL);
                 }
         } else {
-                ret= *a;
+                ret = *a;
 #ifndef OPENSSL_NO_ENGINE
                 if (ret->engine) {
                         ENGINE_finish(ret->engine);
@@ -89,40 +89,44 @@ EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
         }
 
         if (!EVP_PKEY_set_type(ret, type)) {
-                ASN1err(ASN1_F_D2I_PRIVATEKEY,ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
+                ASN1err(ASN1_F_D2I_PRIVATEKEY, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
                 goto err;
         }
 
         if (!ret->ameth->old_priv_decode ||
-                        !ret->ameth->old_priv_decode(ret, pp, length)) {
+            !ret->ameth->old_priv_decode(ret, pp, length)) {
                 if (ret->ameth->priv_decode) {
-                        PKCS8_PRIV_KEY_INFO *p8=NULL;
-                        p8=d2i_PKCS8_PRIV_KEY_INFO(NULL,pp,length);
-                        if (!p8) goto err;
+                        PKCS8_PRIV_KEY_INFO *p8 = NULL;
+                        p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, pp, length);
+                        if (!p8)
+                                goto err;
                         EVP_PKEY_free(ret);
                         ret = EVP_PKCS82PKEY(p8);
                         PKCS8_PRIV_KEY_INFO_free(p8);
-
                 } else {
-                        ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
+                        ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_ASN1_LIB);
                         goto err;
                 }
-        }       
-        if (a != NULL) (*a)=ret;
-        return(ret);
+        }
+        if (a != NULL)
+                (*a) = ret;
+        return (ret);
+
 err:
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) EVP_PKEY_free(ret);
-        return(NULL);
+        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
+                EVP_PKEY_free(ret);
+        return (NULL);
 }
 
 /* This works like d2i_PrivateKey() except it automatically works out the type */
 
-EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
-             long length)
+EVP_PKEY *
+d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp, long length)
 {
         STACK_OF(ASN1_TYPE) *inkey;
         const unsigned char *p;
         int keytype;
+
         p = *pp;
         /* Dirty trick: read in the ASN1 data into a STACK_OF(ASN1_TYPE):
          * by analyzing it we can determine the passed structure: this
@@ -132,25 +136,27 @@ EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
         /* Since we only need to discern "traditional format" RSA and DSA
          * keys we can just count the elements.
          */
-        if(sk_ASN1_TYPE_num(inkey) == 6) 
+        if (sk_ASN1_TYPE_num(inkey) == 6)
                 keytype = EVP_PKEY_DSA;
         else if (sk_ASN1_TYPE_num(inkey) == 4)
                 keytype = EVP_PKEY_EC;
         else if (sk_ASN1_TYPE_num(inkey) == 3)  {
                 /* This seems to be PKCS8, not traditional format */
-                PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL,pp,length);
+                PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(
+                    NULL, pp, length);
                 EVP_PKEY *ret;
 
                 sk_ASN1_TYPE_pop_free(inkey, ASN1_TYPE_free);
                 if (!p8) {
-                        ASN1err(ASN1_F_D2I_AUTOPRIVATEKEY,ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
+                        ASN1err(ASN1_F_D2I_AUTOPRIVATEKEY,
+                            ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
                         return NULL;
                 }
                 ret = EVP_PKCS82PKEY(p8);
                 PKCS8_PRIV_KEY_INFO_free(p8);
                 if (a) {
                         *a = ret;
-                }       
+                }
                 return ret;
         } else
                 keytype = EVP_PKEY_RSA;