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

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

diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c
index ef5fdd470808c96f02fba4ec12327267d6131961..840408620115e50b7884ba13c76fc85718ab627f 100644 (file)
--- a/crypto/bn/bn_recp.c
+++ b/crypto/bn/bn_recp.c
@@ -56,7 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
-#include <stdio.h>
+
+
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
@@ -94,7 +95,7 @@ void BN_RECP_CTX_free(BN_RECP_CTX *recp)
 int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, BN_CTX *ctx)
        {
        if (!BN_copy(&(recp->N),d)) return 0;
-       if (!BN_zero(&(recp->Nr))) return 0;
+       BN_zero(&(recp->Nr));
        recp->num_bits=BN_num_bits(d);
        recp->shift=0;
        return(1);
@@ -123,6 +124,7 @@ int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
        ret = BN_div_recp(NULL,r,ca,recp,ctx);
 err:
        BN_CTX_end(ctx);
+       bn_check_top(r);
        return(ret);
        }
 
@@ -147,7 +149,7 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
 
        if (BN_ucmp(m,&(recp->N)) < 0)
                {
-               if (!BN_zero(d)) return 0;
+               BN_zero(d);
                if (!BN_copy(r,m)) return 0;
                BN_CTX_end(ctx);
                return(1);
@@ -166,15 +168,16 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
 
        /* Nr := round(2^i / N) */
        if (i != recp->shift)
-               recp->shift=BN_reciprocal(&(recp->Nr),&(recp->N),
-                       i,ctx); /* BN_reciprocal returns i, or -1 for an error */
+               recp->shift=BN_reciprocal(&(recp->Nr),&(recp->N),i,ctx);
+       /* BN_reciprocal could have returned -1 for an error */
        if (recp->shift == -1) goto err;
 
-       /* d := |round(round(m / 2^BN_num_bits(N)) * recp->Nr / 2^(i - BN_num_bits(N)))|
-        *    = |round(round(m / 2^BN_num_bits(N)) * round(2^i / N) / 2^(i - BN_num_bits(N)))|
-        *   <= |(m / 2^BN_num_bits(N)) * (2^i / N) * (2^BN_num_bits(N) / 2^i)|
-        *    = |m/N|
-        */
+    /*-
+     * d := |round(round(m / 2^BN_num_bits(N)) * recp->Nr / 2^(i - BN_num_bits(N)))|
+     *    = |round(round(m / 2^BN_num_bits(N)) * round(2^i / N) / 2^(i - BN_num_bits(N)))|
+     *   <= |(m / 2^BN_num_bits(N)) * (2^i / N) * (2^BN_num_bits(N) / 2^i)|
+     *    = |m/N|
+     */
        if (!BN_rshift(a,m,recp->num_bits)) goto err;
        if (!BN_mul(b,a,&(recp->Nr),ctx)) goto err;
        if (!BN_rshift(d,b,i-recp->num_bits)) goto err;
@@ -190,7 +193,7 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
                {
                if (j++ > 2)
                        {
-                       BNerr(BN_F_BN_MOD_MUL_RECIPROCAL,BN_R_BAD_RECIPROCAL);
+                       BNerr(BN_F_BN_DIV_RECP,BN_R_BAD_RECIPROCAL);
                        goto err;
                        }
                if (!BN_usub(r,r,&(recp->N))) goto err;
@@ -203,6 +206,8 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
        ret=1;
 err:
        BN_CTX_end(ctx);
+       bn_check_top(dv);
+       bn_check_top(rem);
        return(ret);
        } 
 
@@ -214,17 +219,18 @@ err:
 int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx)
        {
        int ret= -1;
-       BIGNUM t;
+       BIGNUM *t;
 
-       BN_init(&t);
+       BN_CTX_start(ctx);
+       if((t = BN_CTX_get(ctx)) == NULL) goto err;
 
-       if (!BN_zero(&t)) goto err;
-       if (!BN_set_bit(&t,len)) goto err;
+       if (!BN_set_bit(t,len)) goto err;
 
-       if (!BN_div(r,NULL,&t,m,ctx)) goto err;
+       if (!BN_div(r,NULL,t,m,ctx)) goto err;
 
        ret=len;
 err:
-       BN_free(&t);
+       bn_check_top(r);
+       BN_CTX_end(ctx);
        return(ret);
        }