ec/ecp_nistz256.c: harmonize with latest indent script.

[oweals/openssl.git] / crypto / rsa / rsa_eay.c

diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index 80dab8aa4f534a8758b1b69d95324854e739d7e0..4b7aa5f68e78b6f6f389c8a4dd43353d0d3f06c7 100644 (file)
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -112,7 +112,7 @@
 
 
 #include "cryptlib.h"
-#include <openssl/bn.h>
+#include "internal/bn_int.h"
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
 
@@ -286,11 +286,12 @@ static BN_BLINDING *rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
                {
                /* resort to rsa->mt_blinding instead */
 
-               *local = 0; /* instructs rsa_blinding_convert(), rsa_blinding_invert()
-                            * that the BN_BLINDING is shared, meaning that accesses
-                            * require locks, and that the blinding factor must be
-                            * stored outside the BN_BLINDING
-                            */
+               /* instructs rsa_blinding_convert(), rsa_blinding_invert()
+                * that the BN_BLINDING is shared, meaning that accesses
+                * require locks, and that the blinding factor must be
+                * stored outside the BN_BLINDING
+                */
+               *local = 0;
 
                if (rsa->mt_blinding == NULL)
                        {
@@ -433,13 +434,16 @@ static int RSA_eay_private_encrypt(int flen, const unsigned char *from,
                }
        else
                {
-               BIGNUM local_d;
-               BIGNUM *d = NULL;
+               BIGNUM *d = NULL, *local_d = NULL;
                
                if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
                        {
-                       BN_init(&local_d);
-                       d = &local_d;
+                       local_d = d = BN_new();
+                       if(!d)
+                               {
+                               RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,ERR_R_MALLOC_FAILURE);
+                               goto err;
+                               }
                        BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
                        }
                else
@@ -447,10 +451,18 @@ static int RSA_eay_private_encrypt(int flen, const unsigned char *from,
 
                if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
                        if(!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, CRYPTO_LOCK_RSA, rsa->n, ctx))
+                               {
+                               if(local_d) BN_free(local_d);
                                goto err;
+                               }
 
                if (!rsa->meth->bn_mod_exp(ret,f,d,rsa->n,ctx,
-                               rsa->_method_mod_n)) goto err;
+                               rsa->_method_mod_n))
+                       {
+                       if(local_d) BN_free(local_d);
+                       goto err;
+                       }
+               if(local_d) BN_free(local_d);
                }
 
        if (blinding)
@@ -567,12 +579,16 @@ static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
                }
        else
                {
-               BIGNUM local_d;
-               BIGNUM *d = NULL;
+               BIGNUM *d = NULL, *local_d = NULL;
                
                if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
                        {
-                       d = &local_d;
+                       local_d = d = BN_new();
+                       if(!d)
+                               {
+                               RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,ERR_R_MALLOC_FAILURE);
+                               goto err;
+                               }
                        BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
                        }
                else
@@ -580,10 +596,17 @@ static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
 
                if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
                        if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, CRYPTO_LOCK_RSA, rsa->n, ctx))
+                               {
+                               if(local_d) BN_free(local_d);
                                goto err;
+                               }
                if (!rsa->meth->bn_mod_exp(ret,f,d,rsa->n,ctx,
                                rsa->_method_mod_n))
-                 goto err;
+                       {
+                       if(local_d) BN_free(local_d);
+                       goto err;
+                       }
+               if(local_d) BN_free(local_d);
                }
 
        if (blinding)
@@ -697,7 +720,7 @@ static int RSA_eay_public_decrypt(int flen, const unsigned char *from,
        if (!rsa->meth->bn_mod_exp(ret,f,rsa->e,rsa->n,ctx,
                rsa->_method_mod_n)) goto err;
 
-       if ((padding == RSA_X931_PADDING) && ((ret->d[0] & 0xf) != 12))
+       if ((padding == RSA_X931_PADDING) && ((bn_get_words(ret)[0] & 0xf) != 12))
                if (!BN_sub(ret, rsa->n, ret)) goto err;
 
        p=buf;
@@ -738,17 +761,25 @@ err:
 static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
        {
        BIGNUM *r1,*m1,*vrfy;
-       BIGNUM local_dmp1,local_dmq1,local_c,local_r1;
+       BIGNUM *local_dmp1, *local_dmq1, *local_c, *local_r1;
        BIGNUM *dmp1,*dmq1,*c,*pr1;
        int ret=0;
 
+
+       local_dmp1 = BN_new();
+       local_dmq1 = BN_new();
+       local_c = BN_new();
+       local_r1 = BN_new();
+       if(!local_dmp1 || !local_dmq1 || !local_c || !local_r1)
+               goto err;
+
        BN_CTX_start(ctx);
        r1 = BN_CTX_get(ctx);
        m1 = BN_CTX_get(ctx);
        vrfy = BN_CTX_get(ctx);
 
        {
-               BIGNUM local_p, local_q;
+               BIGNUM *local_p = NULL, *local_q = NULL;
                BIGNUM *p = NULL, *q = NULL;
 
                /* Make sure BN_mod_inverse in Montgomery intialization uses the
@@ -756,12 +787,16 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
                 */
                if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
                        {
-                       BN_init(&local_p);
-                       p = &local_p;
+                       local_p = p = BN_new();
+                       if(!p) goto err;
                        BN_with_flags(p, rsa->p, BN_FLG_CONSTTIME);
 
-                       BN_init(&local_q);
-                       q = &local_q;
+                       local_q = q = BN_new();
+                       if(!q)
+                               {
+                               BN_free(local_p);
+                               goto err;
+                               }
                        BN_with_flags(q, rsa->q, BN_FLG_CONSTTIME);
                        }
                else
@@ -772,11 +807,15 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
 
                if (rsa->flags & RSA_FLAG_CACHE_PRIVATE)
                        {
-                       if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_p, CRYPTO_LOCK_RSA, p, ctx))
-                               goto err;
-                       if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_q, CRYPTO_LOCK_RSA, q, ctx))
+                       if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_p, CRYPTO_LOCK_RSA, p, ctx) || !BN_MONT_CTX_set_locked(&rsa->_method_mod_q, CRYPTO_LOCK_RSA, q, ctx))
+                               {
+                               if(local_p) BN_free(local_p);
+                               if(local_q) BN_free(local_q);
                                goto err;
+                               }
                        }
+               if(local_p) BN_free(local_p);
+               if(local_q) BN_free(local_q);
        }
 
        if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
@@ -786,7 +825,7 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
        /* compute I mod q */
        if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
                {
-               c = &local_c;
+               c = local_c;
                BN_with_flags(c, I, BN_FLG_CONSTTIME);
                if (!BN_mod(r1,c,rsa->q,ctx)) goto err;
                }
@@ -798,7 +837,7 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
        /* compute r1^dmq1 mod q */
        if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
                {
-               dmq1 = &local_dmq1;
+               dmq1 = local_dmq1;
                BN_with_flags(dmq1, rsa->dmq1, BN_FLG_CONSTTIME);
                }
        else
@@ -809,7 +848,7 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
        /* compute I mod p */
        if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
                {
-               c = &local_c;
+               c = local_c;
                BN_with_flags(c, I, BN_FLG_CONSTTIME);
                if (!BN_mod(r1,c,rsa->p,ctx)) goto err;
                }
@@ -821,7 +860,7 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
        /* compute r1^dmp1 mod p */
        if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
                {
-               dmp1 = &local_dmp1;
+               dmp1 = local_dmp1;
                BN_with_flags(dmp1, rsa->dmp1, BN_FLG_CONSTTIME);
                }
        else
@@ -840,7 +879,7 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
        /* Turn BN_FLG_CONSTTIME flag on before division operation */
        if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
                {
-               pr1 = &local_r1;
+               pr1 = local_r1;
                BN_with_flags(pr1, r1, BN_FLG_CONSTTIME);
                }
        else
@@ -876,22 +915,33 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
                         * miscalculated CRT output, just do a raw (slower)
                         * mod_exp and return that instead. */
 
-                       BIGNUM local_d;
+                       BIGNUM *local_d = NULL;
                        BIGNUM *d = NULL;
                
                        if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
                                {
-                               d = &local_d;
+                               local_d = d = BN_new();
+                               if(!d) goto err;
                                BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
                                }
                        else
                                d = rsa->d;
                        if (!rsa->meth->bn_mod_exp(r0,I,d,rsa->n,ctx,
-                                                  rsa->_method_mod_n)) goto err;
+                                                  rsa->_method_mod_n))
+                               {
+                               if(local_d) BN_free(local_d);
+                               goto err;
+                               }
+
+                       if(local_d) BN_free(local_d);
                        }
                }
        ret=1;
 err:
+       if(local_dmp1) BN_free(local_dmp1);
+       if(local_dmq1) BN_free(local_dmq1);
+       if(local_c) BN_free(local_c);
+       if(local_r1) BN_free(local_r1);
        BN_CTX_end(ctx);
        return(ret);
        }