workaround no longer needed

[openssl.git] / crypto / bn / bn_recp.c

diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c
index 97ca857ed1b2463428b1504c79e248ecb1d65d5a..a8796bd0aacfc34b20cc372974831df6dfa229ad 100644 (file)
--- a/crypto/bn/bn_recp.c
+++ b/crypto/bn/bn_recp.c
@@ -60,8 +60,7 @@
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
-void BN_RECP_CTX_init(recp)
-BN_RECP_CTX *recp;
+void BN_RECP_CTX_init(BN_RECP_CTX *recp)
        {
        BN_init(&(recp->N));
        BN_init(&(recp->Nr));
@@ -69,7 +68,7 @@ BN_RECP_CTX *recp;
        recp->flags=0;
        }
 
-BN_RECP_CTX *BN_RECP_CTX_new()
+BN_RECP_CTX *BN_RECP_CTX_new(void)
        {
        BN_RECP_CTX *ret;
 
@@ -81,19 +80,18 @@ BN_RECP_CTX *BN_RECP_CTX_new()
        return(ret);
        }
 
-void BN_RECP_CTX_free(recp)
-BN_RECP_CTX *recp;
+void BN_RECP_CTX_free(BN_RECP_CTX *recp)
        {
+       if(recp == NULL)
+           return;
+
        BN_free(&(recp->N));
        BN_free(&(recp->Nr));
        if (recp->flags & BN_FLG_MALLOCED)
                Free(recp);
        }
 
-int BN_RECP_CTX_set(recp,d,ctx)
-BN_RECP_CTX *recp;
-BIGNUM *d;
-BN_CTX *ctx;
+int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, BN_CTX *ctx)
        {
        BN_copy(&(recp->N),d);
        BN_zero(&(recp->Nr));
@@ -102,17 +100,14 @@ BN_CTX *ctx;
        return(1);
        }
 
-int BN_mod_mul_reciprocal(r, x, y, recp, ctx)
-BIGNUM *r;
-BIGNUM *x;
-BIGNUM *y;
-BN_RECP_CTX *recp;
-BN_CTX *ctx;
+int BN_mod_mul_reciprocal(BIGNUM *r, BIGNUM *x, BIGNUM *y, BN_RECP_CTX *recp,
+            BN_CTX *ctx)
        {
        int ret=0;
        BIGNUM *a;
 
-       a= &(ctx->bn[ctx->tos++]);
+       BN_CTX_start(ctx);
+       if ((a = BN_CTX_get(ctx)) == NULL) goto err;
        if (y != NULL)
                {
                if (x == y)
@@ -126,37 +121,34 @@ BN_CTX *ctx;
        BN_div_recp(NULL,r,a,recp,ctx);
        ret=1;
 err:
-       ctx->tos--;
+       BN_CTX_end(ctx);
        return(ret);
        }
 
-int BN_div_recp(dv,rem,m,recp,ctx)
-BIGNUM *dv;
-BIGNUM *rem;
-BIGNUM *m;
-BN_RECP_CTX *recp;
-BN_CTX *ctx;
+int BN_div_recp(BIGNUM *dv, BIGNUM *rem, BIGNUM *m, BN_RECP_CTX *recp,
+            BN_CTX *ctx)
        {
-       int i,j,tos,ret=0,ex;
+       int i,j,ret=0;
        BIGNUM *a,*b,*d,*r;
 
-       tos=ctx->tos;
-       a= &(ctx->bn[ctx->tos++]);
-       b= &(ctx->bn[ctx->tos++]);
+       BN_CTX_start(ctx);
+       a=BN_CTX_get(ctx);
+       b=BN_CTX_get(ctx);
        if (dv != NULL)
                d=dv;
        else
-               d= &(ctx->bn[ctx->tos++]);
+               d=BN_CTX_get(ctx);
        if (rem != NULL)
                r=rem;
        else
-               r= &(ctx->bn[ctx->tos++]);
+               r=BN_CTX_get(ctx);
+       if (a == NULL || b == NULL || d == NULL || r == NULL) goto err;
 
        if (BN_ucmp(m,&(recp->N)) < 0)
                {
                BN_zero(d);
                BN_copy(r,m);
-               ctx->tos=tos;
+               BN_CTX_end(ctx);
                return(1);
                }
 
@@ -167,33 +159,24 @@ BN_CTX *ctx;
         */
        i=BN_num_bits(m);
 
-       j=recp->num_bits*2;
-       if (j > i)
-               {
-               i=j;
-               ex=0;
-               }
-       else
-               {
-               ex=(i-j)/2;
-               }
-
-       j=i/2;
+       j=recp->num_bits<<1;
+       if (j>i) i=j;
+       j>>=1;
 
        if (i != recp->shift)
                recp->shift=BN_reciprocal(&(recp->Nr),&(recp->N),
                        i,ctx);
 
-       if (!BN_rshift(a,m,j-ex)) goto err;
+       if (!BN_rshift(a,m,j)) goto err;
        if (!BN_mul(b,a,&(recp->Nr),ctx)) goto err;
-       if (!BN_rshift(d,b,j+ex)) goto err;
+       if (!BN_rshift(d,b,i-j)) goto err;
        d->neg=0;
        if (!BN_mul(b,&(recp->N),d,ctx)) goto err;
        if (!BN_usub(r,m,b)) goto err;
        r->neg=0;
 
-       j=0;
 #if 1
+       j=0;
        while (BN_ucmp(r,&(recp->N)) >= 0)
                {
                if (j++ > 2)
@@ -210,7 +193,7 @@ BN_CTX *ctx;
        d->neg=m->neg^recp->N.neg;
        ret=1;
 err:
-       ctx->tos=tos;
+       BN_CTX_end(ctx);
        return(ret);
        } 
 
@@ -218,11 +201,7 @@ err:
  * We actually calculate with an extra word of precision, so
  * we can do faster division if the remainder is not required.
  */
-int BN_reciprocal(r,m,len,ctx)
-BIGNUM *r;
-BIGNUM *m;
-int len;
-BN_CTX *ctx;
+int BN_reciprocal(BIGNUM *r, BIGNUM *m, int len, BN_CTX *ctx)
        {
        int ret= -1;
        BIGNUM t;