1 files changed, 29 insertions, 28 deletions

diff --git a/src/lib/libssl/src/crypto/asn1/d2i_pu.c b/src/lib/libssl/src/crypto/asn1/d2i_pu.c
index ccd03c066f..564f0945b5 100644
--- a/src/lib/libssl/src/crypto/asn1/d2i_pu.c
+++ b/src/lib/libssl/src/crypto/asn1/d2i_pu.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
@@ -72,31 +72,31 @@
 #include <openssl/ec.h>
 #endif
 
-EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
-             long length)
+EVP_PKEY *
+d2i_PublicKey(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_PUBLICKEY,ERR_R_EVP_LIB);
-                        return(NULL);
+                if ((ret = EVP_PKEY_new()) == NULL) {
+                        ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_EVP_LIB);
+                        return (NULL);
                 }
-        }
-        else    ret= *a;
+        } else
+                ret = *a;
 
         if (!EVP_PKEY_set_type(ret, type)) {
-                ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_EVP_LIB);
+                ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_EVP_LIB);
                 goto err;
         }
 
         switch (EVP_PKEY_id(ret)) {
 #ifndef OPENSSL_NO_RSA
         case EVP_PKEY_RSA:
-                if ((ret->pkey.rsa=d2i_RSAPublicKey(NULL,
-                        (const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
+                if ((ret->pkey.rsa = d2i_RSAPublicKey(NULL,
+                    (const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
                 {
-                        ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
+                        ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
                         goto err;
                 }
                 break;
@@ -104,9 +104,9 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
 #ifndef OPENSSL_NO_DSA
         case EVP_PKEY_DSA:
                 if (!d2i_DSAPublicKey(&(ret->pkey.dsa),
-                        (const unsigned char **)pp,length)) /* TMP UGLY CAST */
+                    (const unsigned char **)pp,length)) /* TMP UGLY CAST */
                 {
-                        ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
+                        ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
                         goto err;
                 }
                 break;
@@ -114,22 +114,23 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
 #ifndef OPENSSL_NO_EC
         case EVP_PKEY_EC:
                 if (!o2i_ECPublicKey(&(ret->pkey.ec),
-                                     (const unsigned char **)pp, length))
-                {
+                    (const unsigned char **)pp, length)) {
                         ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
                         goto err;
                 }
-        break;
+                break;
 #endif
         default:
-                ASN1err(ASN1_F_D2I_PUBLICKEY,ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
+                ASN1err(ASN1_F_D2I_PUBLICKEY, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE);
                 goto err;
                 /* break; */
         }
-        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);
 }
-