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

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

diff --git a/crypto/bn/bn_gcd.c b/crypto/bn/bn_gcd.c
index 4a352119ba8aafc0a7164f14337df2e09837de32..233e3f53322bd9e114ff0d815b64aa9b7001d8e9 100644 (file)
--- a/crypto/bn/bn_gcd.c
+++ b/crypto/bn/bn_gcd.c
@@ -109,6 +109,8 @@
  *
  */
 
+
+
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
@@ -205,13 +207,28 @@ err:
 /* solves ax == 1 (mod n) */
 static BIGNUM *BN_mod_inverse_no_branch(BIGNUM *in,
         const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
+
 BIGNUM *BN_mod_inverse(BIGNUM *in,
        const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx)
        {
+       BIGNUM *rv;
+       int noinv;
+       rv = int_bn_mod_inverse(in, a, n, ctx, &noinv);
+       if (noinv)
+               BNerr(BN_F_BN_MOD_INVERSE,BN_R_NO_INVERSE);
+       return rv;
+       }
+
+BIGNUM *int_bn_mod_inverse(BIGNUM *in,
+       const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx, int *pnoinv)
+       {
        BIGNUM *A,*B,*X,*Y,*M,*D,*T,*R=NULL;
        BIGNUM *ret=NULL;
        int sign;
 
+       if (pnoinv)
+               *pnoinv = 0;
+
        if ((BN_get_flags(a, BN_FLG_CONSTTIME) != 0) || (BN_get_flags(n, BN_FLG_CONSTTIME) != 0))
                {
                return BN_mod_inverse_no_branch(in, a, n, ctx);
@@ -246,7 +263,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *in,
                if (!BN_nnmod(B, B, A, ctx)) goto err;
                }
        sign = -1;
-       /* From  B = a mod |n|,  A = |n|  it follows that
+       /*-
+        * From  B = a mod |n|,  A = |n|  it follows that
         *
         *      0 <= B < A,
         *     -sign*X*a  ==  B   (mod |n|),
@@ -263,7 +281,7 @@ BIGNUM *BN_mod_inverse(BIGNUM *in,
                
                while (!BN_is_zero(B))
                        {
-                       /*
+                       /*-
                         *      0 < B < |n|,
                         *      0 < A <= |n|,
                         * (1) -sign*X*a  ==  B   (mod |n|),
@@ -310,7 +328,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *in,
                                }
 
                        
-                       /* We still have (1) and (2).
+                       /*-
+                        * We still have (1) and (2).
                         * Both  A  and  B  are odd.
                         * The following computations ensure that
                         *
@@ -346,7 +365,7 @@ BIGNUM *BN_mod_inverse(BIGNUM *in,
                        {
                        BIGNUM *tmp;
                        
-                       /*
+                       /*-
                         *      0 < B < A,
                         * (*) -sign*X*a  ==  B   (mod |n|),
                         *      sign*Y*a  ==  A   (mod |n|)
@@ -393,7 +412,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *in,
                                if (!BN_div(D,M,A,B,ctx)) goto err;
                                }
                        
-                       /* Now
+                       /*-
+                        * Now
                         *      A = D*B + M;
                         * thus we have
                         * (**)  sign*Y*a  ==  D*B + M   (mod |n|).
@@ -406,7 +426,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *in,
                        B=M;
                        /* ... so we have  0 <= B < A  again */
                        
-                       /* Since the former  M  is now  B  and the former  B  is now  A,
+                       /*-
+                        * Since the former  M  is now  B  and the former  B  is now  A,
                         * (**) translates into
                         *       sign*Y*a  ==  D*A + B    (mod |n|),
                         * i.e.
@@ -459,7 +480,7 @@ BIGNUM *BN_mod_inverse(BIGNUM *in,
                        }
                }
                
-       /*
+       /*-
         * The while loop (Euclid's algorithm) ends when
         *      A == gcd(a,n);
         * we have
@@ -488,7 +509,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *in,
                }
        else
                {
-               BNerr(BN_F_BN_MOD_INVERSE,BN_R_NO_INVERSE);
+               if (pnoinv)
+                       *pnoinv = 1;
                goto err;
                }
        ret=R;
@@ -547,7 +569,8 @@ static BIGNUM *BN_mod_inverse_no_branch(BIGNUM *in,
                if (!BN_nnmod(B, pB, A, ctx)) goto err;
                }
        sign = -1;
-       /* From  B = a mod |n|,  A = |n|  it follows that
+       /*-
+        * From  B = a mod |n|,  A = |n|  it follows that
         *
         *      0 <= B < A,
         *     -sign*X*a  ==  B   (mod |n|),
@@ -558,7 +581,7 @@ static BIGNUM *BN_mod_inverse_no_branch(BIGNUM *in,
                {
                BIGNUM *tmp;
                
-               /*
+               /*-
                 *      0 < B < A,
                 * (*) -sign*X*a  ==  B   (mod |n|),
                 *      sign*Y*a  ==  A   (mod |n|)
@@ -573,7 +596,8 @@ static BIGNUM *BN_mod_inverse_no_branch(BIGNUM *in,
                /* (D, M) := (A/B, A%B) ... */          
                if (!BN_div(D,M,pA,B,ctx)) goto err;
                
-               /* Now
+               /*-
+                * Now
                 *      A = D*B + M;
                 * thus we have
                 * (**)  sign*Y*a  ==  D*B + M   (mod |n|).
@@ -586,7 +610,8 @@ static BIGNUM *BN_mod_inverse_no_branch(BIGNUM *in,
                B=M;
                /* ... so we have  0 <= B < A  again */
                
-               /* Since the former  M  is now  B  and the former  B  is now  A,
+               /*-
+                * Since the former  M  is now  B  and the former  B  is now  A,
                 * (**) translates into
                 *       sign*Y*a  ==  D*A + B    (mod |n|),
                 * i.e.
@@ -614,7 +639,7 @@ static BIGNUM *BN_mod_inverse_no_branch(BIGNUM *in,
                sign = -sign;
                }
                
-       /*
+       /*-
         * The while loop (Euclid's algorithm) ends when
         *      A == gcd(a,n);
         * we have