1 files changed, 43 insertions, 40 deletions

diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c
index b832ec6a6b..88c0a45544 100644
--- a/src/lib/libcrypto/evp/p_open.c
+++ b/src/lib/libcrypto/evp/p_open.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
@@ -66,57 +66,60 @@
 #include <openssl/x509.h>
 #include <openssl/rsa.h>
 
-int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-        const unsigned char *ek, int ekl, const unsigned char *iv,
-        EVP_PKEY *priv)
-        {
-        unsigned char *key=NULL;
-        int i,size=0,ret=0;
+int
+EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
+    const unsigned char *ek, int ekl, const unsigned char *iv, EVP_PKEY *priv)
+{
+        unsigned char *key = NULL;
+        int i, size = 0, ret = 0;
 
-        if(type) {      
+        if (type) {
                 EVP_CIPHER_CTX_init(ctx);
-                if(!EVP_DecryptInit_ex(ctx,type,NULL, NULL,NULL)) return 0;
+                if (!EVP_DecryptInit_ex(ctx, type, NULL, NULL, NULL))
+                        return 0;
         }
 
-        if(!priv) return 1;
+        if (!priv)
+                return 1;
 
-        if (priv->type != EVP_PKEY_RSA)
-                {
-                EVPerr(EVP_F_EVP_OPENINIT,EVP_R_PUBLIC_KEY_NOT_RSA);
+        if (priv->type != EVP_PKEY_RSA) {
+                EVPerr(EVP_F_EVP_OPENINIT, EVP_R_PUBLIC_KEY_NOT_RSA);
                 goto err;
-                }
+        }
 
-        size=RSA_size(priv->pkey.rsa);
-        key=(unsigned char *)malloc(size+2);
-        if (key == NULL)
-                {
+        size = RSA_size(priv->pkey.rsa);
+        key = (unsigned char *)malloc(size + 2);
+        if (key == NULL) {
                 /* ERROR */
-                EVPerr(EVP_F_EVP_OPENINIT,ERR_R_MALLOC_FAILURE);
+                EVPerr(EVP_F_EVP_OPENINIT, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
-        i=EVP_PKEY_decrypt_old(key,ek,ekl,priv);
-        if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(ctx, i))
-                {
+        i = EVP_PKEY_decrypt_old(key, ek, ekl, priv);
+        if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(ctx, i)) {
                 /* ERROR */
                 goto err;
-                }
-        if(!EVP_DecryptInit_ex(ctx,NULL,NULL,key,iv)) goto err;
+        }
+        if (!EVP_DecryptInit_ex(ctx, NULL, NULL, key, iv))
+                goto err;
+
+        ret = 1;
 
-        ret=1;
 err:
-        if (key != NULL) OPENSSL_cleanse(key,size);
+        if (key != NULL)
+                OPENSSL_cleanse(key, size);
         free(key);
-        return(ret);
-        }
+        return (ret);
+}
 
-int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
-        {
+int
+EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
+{
         int i;
 
-        i=EVP_DecryptFinal_ex(ctx,out,outl);
+        i = EVP_DecryptFinal_ex(ctx, out, outl);
         if (i)
-                i = EVP_DecryptInit_ex(ctx,NULL,NULL,NULL,NULL);
-        return(i);
-        }
+                i = EVP_DecryptInit_ex(ctx, NULL, NULL, NULL, NULL);
+        return (i);
+}
 #endif