resolve conflicts

1 files changed, 68 insertions, 65 deletions

diff --git a/src/lib/libcrypto/bn/bn_exp.c b/src/lib/libcrypto/bn/bn_exp.c
index 9e1e88abe8..70a33f0d93 100644
--- a/src/lib/libcrypto/bn/bn_exp.c
+++ b/src/lib/libcrypto/bn/bn_exp.c
@@ -122,9 +122,9 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
         int i,bits,ret=0;
         BIGNUM *v,*rr;
 
-        if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
+        if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0)
                 {
-                /* BN_FLG_EXP_CONSTTIME only supported by BN_mod_exp_mont() */
+                /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
                 BNerr(BN_F_BN_EXP,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                 return -1;
                 }
@@ -155,6 +155,7 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
 err:
         if (r != rr) BN_copy(r,rr);
         BN_CTX_end(ctx);
+        bn_check_top(r);
         return(ret);
         }
 
@@ -212,7 +213,7 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
         if (BN_is_odd(m))
                 {
 #  ifdef MONT_EXP_WORD
-                if (a->top == 1 && !a->neg && (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) == 0))
+                if (a->top == 1 && !a->neg && (BN_get_flags(p, BN_FLG_CONSTTIME) == 0))
                         {
                         BN_ULONG A = a->d[0];
                         ret=BN_mod_exp_mont_word(r,A,p,m,ctx,NULL);
@@ -229,6 +230,7 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
                 { ret=BN_mod_exp_simple(r,a,p,m,ctx); }
 #endif
 
+        bn_check_top(r);
         return(ret);
         }
 
@@ -237,14 +239,15 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                     const BIGNUM *m, BN_CTX *ctx)
         {
         int i,j,bits,ret=0,wstart,wend,window,wvalue;
-        int start=1,ts=0;
+        int start=1;
         BIGNUM *aa;
-        BIGNUM val[TABLE_SIZE];
+        /* Table of variables obtained from 'ctx' */
+        BIGNUM *val[TABLE_SIZE];
         BN_RECP_CTX recp;
 
-        if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
+        if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0)
                 {
-                /* BN_FLG_EXP_CONSTTIME only supported by BN_mod_exp_mont() */
+                /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
                 BNerr(BN_F_BN_MOD_EXP_RECP,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                 return -1;
                 }
@@ -258,7 +261,9 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 }
 
         BN_CTX_start(ctx);
-        if ((aa = BN_CTX_get(ctx)) == NULL) goto err;
+        aa = BN_CTX_get(ctx);
+        val[0] = BN_CTX_get(ctx);
+        if(!aa || !val[0]) goto err;
 
         BN_RECP_CTX_init(&recp);
         if (m->neg)
@@ -273,29 +278,27 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 if (BN_RECP_CTX_set(&recp,m,ctx) <= 0) goto err;
                 }
 
-        BN_init(&(val[0]));
-        ts=1;
-
-        if (!BN_nnmod(&(val[0]),a,m,ctx)) goto err;             /* 1 */
-        if (BN_is_zero(&(val[0])))
+        if (!BN_nnmod(val[0],a,m,ctx)) goto err;                /* 1 */
+        if (BN_is_zero(val[0]))
                 {
-                ret = BN_zero(r);
+                BN_zero(r);
+                ret = 1;
                 goto err;
                 }
 
         window = BN_window_bits_for_exponent_size(bits);
         if (window > 1)
                 {
-                if (!BN_mod_mul_reciprocal(aa,&(val[0]),&(val[0]),&recp,ctx))
+                if (!BN_mod_mul_reciprocal(aa,val[0],val[0],&recp,ctx))
                         goto err;                               /* 2 */
                 j=1<<(window-1);
                 for (i=1; i<j; i++)
                         {
-                        BN_init(&val[i]);
-                        if (!BN_mod_mul_reciprocal(&(val[i]),&(val[i-1]),aa,&recp,ctx))
+                        if(((val[i] = BN_CTX_get(ctx)) == NULL) ||
+                                        !BN_mod_mul_reciprocal(val[i],val[i-1],
+                                                aa,&recp,ctx))
                                 goto err;
                         }
-                ts=i;
                 }
                 
         start=1;        /* This is used to avoid multiplication etc
@@ -347,7 +350,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                                 }
                 
                 /* wvalue will be an odd number < 2^window */
-                if (!BN_mod_mul_reciprocal(r,r,&(val[wvalue>>1]),&recp,ctx))
+                if (!BN_mod_mul_reciprocal(r,r,val[wvalue>>1],&recp,ctx))
                         goto err;
 
                 /* move the 'window' down further */
@@ -359,9 +362,8 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         ret=1;
 err:
         BN_CTX_end(ctx);
-        for (i=0; i<ts; i++)
-                BN_clear_free(&(val[i]));
         BN_RECP_CTX_free(&recp);
+        bn_check_top(r);
         return(ret);
         }
 
@@ -370,13 +372,14 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
                     const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
         {
         int i,j,bits,ret=0,wstart,wend,window,wvalue;
-        int start=1,ts=0;
+        int start=1;
         BIGNUM *d,*r;
         const BIGNUM *aa;
-        BIGNUM val[TABLE_SIZE];
+        /* Table of variables obtained from 'ctx' */
+        BIGNUM *val[TABLE_SIZE];
         BN_MONT_CTX *mont=NULL;
 
-        if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
+        if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0)
                 {
                 return BN_mod_exp_mont_consttime(rr, a, p, m, ctx, in_mont);
                 }
@@ -385,7 +388,7 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
         bn_check_top(p);
         bn_check_top(m);
 
-        if (!(m->d[0] & 1))
+        if (!BN_is_odd(m))
                 {
                 BNerr(BN_F_BN_MOD_EXP_MONT,BN_R_CALLED_WITH_EVEN_MODULUS);
                 return(0);
@@ -400,7 +403,8 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
         BN_CTX_start(ctx);
         d = BN_CTX_get(ctx);
         r = BN_CTX_get(ctx);
-        if (d == NULL || r == NULL) goto err;
+        val[0] = BN_CTX_get(ctx);
+        if (!d || !r || !val[0]) goto err;
 
         /* If this is not done, things will break in the montgomery
          * part */
@@ -413,35 +417,34 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
                 if (!BN_MONT_CTX_set(mont,m,ctx)) goto err;
                 }
 
-        BN_init(&val[0]);
-        ts=1;
         if (a->neg || BN_ucmp(a,m) >= 0)
                 {
-                if (!BN_nnmod(&(val[0]),a,m,ctx))
+                if (!BN_nnmod(val[0],a,m,ctx))
                         goto err;
-                aa= &(val[0]);
+                aa= val[0];
                 }
         else
                 aa=a;
         if (BN_is_zero(aa))
                 {
-                ret = BN_zero(rr);
+                BN_zero(rr);
+                ret = 1;
                 goto err;
                 }
-        if (!BN_to_montgomery(&(val[0]),aa,mont,ctx)) goto err; /* 1 */
+        if (!BN_to_montgomery(val[0],aa,mont,ctx)) goto err; /* 1 */
 
         window = BN_window_bits_for_exponent_size(bits);
         if (window > 1)
                 {
-                if (!BN_mod_mul_montgomery(d,&(val[0]),&(val[0]),mont,ctx)) goto err; /* 2 */
+                if (!BN_mod_mul_montgomery(d,val[0],val[0],mont,ctx)) goto err; /* 2 */
                 j=1<<(window-1);
                 for (i=1; i<j; i++)
                         {
-                        BN_init(&(val[i]));
-                        if (!BN_mod_mul_montgomery(&(val[i]),&(val[i-1]),d,mont,ctx))
+                        if(((val[i] = BN_CTX_get(ctx)) == NULL) ||
+                                        !BN_mod_mul_montgomery(val[i],val[i-1],
+                                                d,mont,ctx))
                                 goto err;
                         }
-                ts=i;
                 }
 
         start=1;        /* This is used to avoid multiplication etc
@@ -494,7 +497,7 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
                                 }
                 
                 /* wvalue will be an odd number < 2^window */
-                if (!BN_mod_mul_montgomery(r,r,&(val[wvalue>>1]),mont,ctx))
+                if (!BN_mod_mul_montgomery(r,r,val[wvalue>>1],mont,ctx))
                         goto err;
 
                 /* move the 'window' down further */
@@ -508,8 +511,7 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
 err:
         if ((in_mont == NULL) && (mont != NULL)) BN_MONT_CTX_free(mont);
         BN_CTX_end(ctx);
-        for (i=0; i<ts; i++)
-                BN_clear_free(&(val[i]));
+        bn_check_top(rr);
         return(ret);
         }
 
@@ -535,7 +537,7 @@ static int MOD_EXP_CTIME_COPY_TO_PREBUF(BIGNUM *b, int top, unsigned char *buf,
                 buf[j] = ((unsigned char*)b->d)[i];
                 }
 
-        bn_fix_top(b);
+        bn_correct_top(b);
         return 1;
         }
 
@@ -552,7 +554,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top, unsigned char *buf
                 }
 
         b->top = top;
-        bn_fix_top(b);
+        bn_correct_top(b);
         return 1;
         }       
 
@@ -743,9 +745,9 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
 #define BN_TO_MONTGOMERY_WORD(r, w, mont) \
                 (BN_set_word(r, (w)) && BN_to_montgomery(r, r, (mont), ctx))
 
-        if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
+        if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0)
                 {
-                /* BN_FLG_EXP_CONSTTIME only supported by BN_mod_exp_mont() */
+                /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
                 BNerr(BN_F_BN_MOD_EXP_MONT_WORD,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                 return -1;
                 }
@@ -753,7 +755,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
         bn_check_top(p);
         bn_check_top(m);
 
-        if (m->top == 0 || !(m->d[0] & 1))
+        if (!BN_is_odd(m))
                 {
                 BNerr(BN_F_BN_MOD_EXP_MONT_WORD,BN_R_CALLED_WITH_EVEN_MODULUS);
                 return(0);
@@ -769,7 +771,8 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
                 }
         if (a == 0)
                 {
-                ret = BN_zero(rr);
+                BN_zero(rr);
+                ret = 1;
                 return ret;
                 }
 
@@ -863,23 +866,24 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
 err:
         if ((in_mont == NULL) && (mont != NULL)) BN_MONT_CTX_free(mont);
         BN_CTX_end(ctx);
+        bn_check_top(rr);
         return(ret);
         }
 
 
 /* The old fallback, simple version :-) */
-int BN_mod_exp_simple(BIGNUM *r,
-        const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
-        BN_CTX *ctx)
+int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+                const BIGNUM *m, BN_CTX *ctx)
         {
-        int i,j,bits,ret=0,wstart,wend,window,wvalue,ts=0;
+        int i,j,bits,ret=0,wstart,wend,window,wvalue;
         int start=1;
         BIGNUM *d;
-        BIGNUM val[TABLE_SIZE];
+        /* Table of variables obtained from 'ctx' */
+        BIGNUM *val[TABLE_SIZE];
 
-        if (BN_get_flags(p, BN_FLG_EXP_CONSTTIME) != 0)
+        if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0)
                 {
-                /* BN_FLG_EXP_CONSTTIME only supported by BN_mod_exp_mont() */
+                /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
                 BNerr(BN_F_BN_MOD_EXP_SIMPLE,ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
                 return -1;
                 }
@@ -893,30 +897,30 @@ int BN_mod_exp_simple(BIGNUM *r,
                 }
 
         BN_CTX_start(ctx);
-        if ((d = BN_CTX_get(ctx)) == NULL) goto err;
+        d = BN_CTX_get(ctx);
+        val[0] = BN_CTX_get(ctx);
+        if(!d || !val[0]) goto err;
 
-        BN_init(&(val[0]));
-        ts=1;
-        if (!BN_nnmod(&(val[0]),a,m,ctx)) goto err;             /* 1 */
-        if (BN_is_zero(&(val[0])))
+        if (!BN_nnmod(val[0],a,m,ctx)) goto err;                /* 1 */
+        if (BN_is_zero(val[0]))
                 {
-                ret = BN_zero(r);
+                BN_zero(r);
+                ret = 1;
                 goto err;
                 }
 
         window = BN_window_bits_for_exponent_size(bits);
         if (window > 1)
                 {
-                if (!BN_mod_mul(d,&(val[0]),&(val[0]),m,ctx))
+                if (!BN_mod_mul(d,val[0],val[0],m,ctx))
                         goto err;                               /* 2 */
                 j=1<<(window-1);
                 for (i=1; i<j; i++)
                         {
-                        BN_init(&(val[i]));
-                        if (!BN_mod_mul(&(val[i]),&(val[i-1]),d,m,ctx))
+                        if(((val[i] = BN_CTX_get(ctx)) == NULL) ||
+                                        !BN_mod_mul(val[i],val[i-1],d,m,ctx))
                                 goto err;
                         }
-                ts=i;
                 }
 
         start=1;        /* This is used to avoid multiplication etc
@@ -968,7 +972,7 @@ int BN_mod_exp_simple(BIGNUM *r,
                                 }
                 
                 /* wvalue will be an odd number < 2^window */
-                if (!BN_mod_mul(r,r,&(val[wvalue>>1]),m,ctx))
+                if (!BN_mod_mul(r,r,val[wvalue>>1],m,ctx))
                         goto err;
 
                 /* move the 'window' down further */
@@ -980,8 +984,7 @@ int BN_mod_exp_simple(BIGNUM *r,
         ret=1;
 err:
         BN_CTX_end(ctx);
-        for (i=0; i<ts; i++)
-                BN_clear_free(&(val[i]));
+        bn_check_top(r);
         return(ret);
         }