1 files changed, 45 insertions, 42 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
index 06bd8ded96..ede772cb83 100644
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ b/src/lib/libcrypto/rsa/rsa_eay.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: rsa_eay.c,v 1.30 2014/07/09 08:44:53 miod Exp $ */
+/* $OpenBSD: rsa_eay.c,v 1.31 2014/07/09 19:51:38 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * 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
@@ -63,7 +63,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
@@ -116,16 +116,17 @@
 #include <openssl/rand.h>
 
 static int RSA_eay_public_encrypt(int flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int RSA_eay_private_encrypt(int flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int RSA_eay_public_decrypt(int flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx);
 static int RSA_eay_init(RSA *rsa);
 static int RSA_eay_finish(RSA *rsa);
+
 static RSA_METHOD rsa_pkcs1_eay_meth = {
         .name = "Eric Young's PKCS#1 RSA",
         .rsa_pub_enc = RSA_eay_public_encrypt,
@@ -170,8 +171,8 @@ RSA_eay_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
                         return -1;
                 }
         }
-        
-        if ((ctx=BN_CTX_new()) == NULL)
+
+        if ((ctx = BN_CTX_new()) == NULL)
                 goto err;
         BN_CTX_start(ctx);
         f = BN_CTX_get(ctx);
@@ -179,7 +180,7 @@ RSA_eay_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
         num = BN_num_bytes(rsa->n);
         buf = malloc(num);
         if (!f || !ret || !buf) {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,ERR_R_MALLOC_FAILURE);
+                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT, ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -189,7 +190,7 @@ RSA_eay_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
                 break;
 #ifndef OPENSSL_NO_SHA
         case RSA_PKCS1_OAEP_PADDING:
-                i = RSA_padding_add_PKCS1_OAEP(buf, num, from, flen, NULL, 0);
+                i = RSA_padding_add_PKCS1_OAEP(buf, num, from, flen, NULL, 0);
                 break;
 #endif
         case RSA_SSLV23_PADDING:
@@ -208,7 +209,7 @@ RSA_eay_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
 
         if (BN_bin2bn(buf, num, f) == NULL)
                 goto err;
-        
+
         if (BN_ucmp(f, rsa->n) >= 0) {
                 /* usually the padding functions would catch this */
                 RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,
@@ -221,7 +222,8 @@ RSA_eay_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
                     CRYPTO_LOCK_RSA, rsa->n, ctx))
                         goto err;
 
-        if (!rsa->meth->bn_mod_exp(ret,f,rsa->e,rsa->n,ctx, rsa->_method_mod_n))
+        if (!rsa->meth->bn_mod_exp(ret, f,rsa->e, rsa->n, ctx,
+            rsa->_method_mod_n))
                 goto err;
 
         /* put in leading 0 bytes if the number is less than the
@@ -286,7 +288,7 @@ rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
                                 CRYPTO_w_lock(CRYPTO_LOCK_RSA);
                                 got_write_lock = 1;
                         }
-                        
+
                         if (rsa->mt_blinding == NULL)
                                 rsa->mt_blinding = RSA_setup_blinding(rsa, ctx);
                 }
@@ -355,7 +357,7 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
         BIGNUM *unblind = NULL;
         BN_BLINDING *blinding = NULL;
 
-        if ((ctx=BN_CTX_new()) == NULL)
+        if ((ctx = BN_CTX_new()) == NULL)
                 goto err;
         BN_CTX_start(ctx);
         f = BN_CTX_get(ctx);
@@ -386,10 +388,10 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
         if (i <= 0)
                 goto err;
 
-        if (BN_bin2bn(buf,num,f) == NULL)
+        if (BN_bin2bn(buf, num, f) == NULL)
                 goto err;
-        
-        if (BN_ucmp(f, rsa->n) >= 0) {  
+
+                if (BN_ucmp(f, rsa->n) >= 0) {
                 /* usually the padding functions would catch this */
                 RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,
                     RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
@@ -404,7 +406,7 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
                         goto err;
                 }
         }
-        
+
         if (blinding != NULL) {
                 if (!local_blinding && ((unblind = BN_CTX_get(ctx)) == NULL)) {
                         RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,
@@ -417,13 +419,13 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
 
         if ((rsa->flags & RSA_FLAG_EXT_PKEY) ||
             (rsa->p != NULL && rsa->q != NULL && rsa->dmp1 != NULL &&
-             rsa->dmq1 != NULL && rsa->iqmp != NULL)) { 
+            rsa->dmq1 != NULL && rsa->iqmp != NULL)) {
                 if (!rsa->meth->rsa_mod_exp(ret, f, rsa, ctx))
                         goto err;
         } else {
                 BIGNUM local_d;
                 BIGNUM *d = NULL;
-                
+
                 if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
                         BN_init(&local_d);
                         d = &local_d;
@@ -436,7 +438,7 @@ RSA_eay_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
                             CRYPTO_LOCK_RSA, rsa->n, ctx))
                                 goto err;
 
-                if (!rsa->meth->bn_mod_exp(ret, f, d, rsa->n,ctx,
+                if (!rsa->meth->bn_mod_exp(ret, f, d, rsa->n, ctx,
                     rsa->_method_mod_n))
                         goto err;
         }
@@ -530,7 +532,7 @@ RSA_eay_private_decrypt(int flen, const unsigned char *from, unsigned char *to,
                         goto err;
                 }
         }
-        
+
         if (blinding != NULL) {
                 if (!local_blinding && ((unblind = BN_CTX_get(ctx)) == NULL)) {
                         RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,
@@ -544,13 +546,13 @@ RSA_eay_private_decrypt(int flen, const unsigned char *from, unsigned char *to,
         /* do the decrypt */
         if ((rsa->flags & RSA_FLAG_EXT_PKEY) ||
             (rsa->p != NULL && rsa->q != NULL && rsa->dmp1 != NULL &&
-             rsa->dmq1 != NULL && rsa->iqmp != NULL)) {
+            rsa->dmq1 != NULL && rsa->iqmp != NULL)) {
                 if (!rsa->meth->rsa_mod_exp(ret, f, rsa, ctx))
                         goto err;
         } else {
                 BIGNUM local_d;
                 BIGNUM *d = NULL;
-                
+
                 if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
                         d = &local_d;
                         BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
@@ -578,11 +580,11 @@ RSA_eay_private_decrypt(int flen, const unsigned char *from, unsigned char *to,
                 r = RSA_padding_check_PKCS1_type_2(to, num, buf, j, num);
                 break;
 #ifndef OPENSSL_NO_SHA
-        case RSA_PKCS1_OAEP_PADDING:
-                r = RSA_padding_check_PKCS1_OAEP(to, num, buf, j, num, NULL, 0);
-                break;
+        case RSA_PKCS1_OAEP_PADDING:
+                r = RSA_padding_check_PKCS1_OAEP(to, num, buf, j, num, NULL, 0);
+                break;
 #endif
-        case RSA_SSLV23_PADDING:
+        case RSA_SSLV23_PADDING:
                 r = RSA_padding_check_SSLv23(to, num, buf, j, num);
                 break;
         case RSA_NO_PADDING:
@@ -603,7 +605,7 @@ err:
                 BN_CTX_free(ctx);
         }
         if (buf != NULL) {
-                OPENSSL_cleanse(buf,num);
+                OPENSSL_cleanse(buf, num);
                 free(buf);
         }
         return r;
@@ -615,7 +617,7 @@ RSA_eay_public_decrypt(int flen, const unsigned char *from, unsigned char *to,
     RSA *rsa, int padding)
 {
         BIGNUM *f, *ret;
-        int i, num = 0,r = -1;
+        int i, num = 0, r = -1;
         unsigned char *p;
         unsigned char *buf = NULL;
         BN_CTX *ctx = NULL;
@@ -637,7 +639,7 @@ RSA_eay_public_decrypt(int flen, const unsigned char *from, unsigned char *to,
                         return -1;
                 }
         }
-        
+
         if ((ctx = BN_CTX_new()) == NULL)
                 goto err;
         BN_CTX_start(ctx);
@@ -658,7 +660,7 @@ RSA_eay_public_decrypt(int flen, const unsigned char *from, unsigned char *to,
                 goto err;
         }
 
-        if (BN_bin2bn(from,flen,f) == NULL)
+        if (BN_bin2bn(from, flen, f) == NULL)
                 goto err;
 
         if (BN_ucmp(f, rsa->n) >= 0) {
@@ -801,7 +803,7 @@ RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
                 BN_with_flags(dmp1, rsa->dmp1, BN_FLG_CONSTTIME);
         } else
                 dmp1 = rsa->dmp1;
-        if (!rsa->meth->bn_mod_exp(r0, r1, dmp1, rsa->p,ctx,
+        if (!rsa->meth->bn_mod_exp(r0, r1, dmp1, rsa->p, ctx,
             rsa->_method_mod_p))
                 goto err;
 
@@ -824,7 +826,7 @@ RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
                 BN_with_flags(pr1, r1, BN_FLG_CONSTTIME);
         } else
                 pr1 = r1;
-        if (!BN_mod(r0, pr1, rsa->p,ctx))
+        if (!BN_mod(r0, pr1, rsa->p, ctx))
                 goto err;
 
         /*
@@ -869,7 +871,7 @@ RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
 
                         BIGNUM local_d;
                         BIGNUM *d = NULL;
-                
+
                         if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME)) {
                                 d = &local_d;
                                 BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
@@ -890,7 +892,7 @@ static int
 RSA_eay_init(RSA *rsa)
 {
         rsa->flags |= RSA_FLAG_CACHE_PUBLIC | RSA_FLAG_CACHE_PRIVATE;
-        return 1 ;
+        return 1;
 }
 
 static int
@@ -902,5 +904,6 @@ RSA_eay_finish(RSA *rsa)
                 BN_MONT_CTX_free(rsa->_method_mod_p);
         if (rsa->_method_mod_q != NULL)
                 BN_MONT_CTX_free(rsa->_method_mod_q);
+
         return 1;
 }