projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
forgot to remove the loop variable
[openssl.git] / crypto / bn / bntest.c
diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c
index 9162999c27d3d84a4397159e72d7f8a4c1f9a591..91563dd22228ad1a314a24c4576f06027f66f7de 100644 (file)
--- a/crypto/bn/bntest.c
+++ b/crypto/bn/bntest.c
@@ -124,9 +124,7 @@ int main(int argc, char *argv[])
 
        results = 0;
 
-       RAND_seed(rnd_seed, sizeof rnd_seed); /* or BN_rand may fail, and we don't
-                                              * even check its return value
-                                              * (which we should) */
+       RAND_seed(rnd_seed, sizeof rnd_seed); /* or BN_generate_prime may fail */
 
        argc--;
        argv++;
@@ -165,7 +163,6 @@ int main(int argc, char *argv[])
        if (!results)
                BIO_puts(out,"obase=16\nibase=16\n");
 
-#if 0
        message(out,"BN_add");
        if (!test_add(out)) goto err;
        BIO_flush(out);
@@ -230,7 +227,6 @@ int main(int argc, char *argv[])
        message(out,"BN_exp");
        if (!test_exp(out,ctx)) goto err;
        BIO_flush(out);
-#endif
 
        message(out,"BN_kronecker");
        if (!test_kron(out,ctx)) goto err;
@@ -259,21 +255,17 @@ int test_add(BIO *bp)
        {
        BIGNUM a,b,c;
        int i;
-       int j;
 
        BN_init(&a);
        BN_init(&b);
        BN_init(&c);
 
-       BN_rand(&a,512,0,0);
+       BN_bntest_rand(&a,512,0,0);
        for (i=0; i<num0; i++)
                {
-               BN_rand(&b,450+i,0,0);
+               BN_bntest_rand(&b,450+i,0,0);
                a.neg=rand_neg();
                b.neg=rand_neg();
-               if (bp == NULL)
-                       for (j=0; j<10000; j++)
-                               BN_add(&c,&a,&b);
                BN_add(&c,&a,&b);
                if (bp != NULL)
                        {
@@ -307,7 +299,6 @@ int test_sub(BIO *bp)
        {
        BIGNUM a,b,c;
        int i;
-       int j;
 
        BN_init(&a);
        BN_init(&b);
@@ -317,20 +308,17 @@ int test_sub(BIO *bp)
                {
                if (i < num1)
                        {
-                       BN_rand(&a,512,0,0);
+                       BN_bntest_rand(&a,512,0,0);
                        BN_copy(&b,&a);
                        if (BN_set_bit(&a,i)==0) return(0);
                        BN_add_word(&b,i);
                        }
                else
                        {
-                       BN_rand(&b,400+i-num1,0,0);
+                       BN_bntest_rand(&b,400+i-num1,0,0);
                        a.neg=rand_neg();
                        b.neg=rand_neg();
                        }
-               if (bp == NULL)
-                       for (j=0; j<10000; j++)
-                               BN_sub(&c,&a,&b);
                BN_sub(&c,&a,&b);
                if (bp != NULL)
                        {
@@ -362,7 +350,6 @@ int test_div(BIO *bp, BN_CTX *ctx)
        {
        BIGNUM a,b,c,d,e;
        int i;
-       int j;
 
        BN_init(&a);
        BN_init(&b);
@@ -374,18 +361,15 @@ int test_div(BIO *bp, BN_CTX *ctx)
                {
                if (i < num1)
                        {
-                       BN_rand(&a,400,0,0);
+                       BN_bntest_rand(&a,400,0,0);
                        BN_copy(&b,&a);
                        BN_lshift(&a,&a,i);
                        BN_add_word(&a,i);
                        }
                else
-                       BN_rand(&b,50+3*(i-num1),0,0);
+                       BN_bntest_rand(&b,50+3*(i-num1),0,0);
                a.neg=rand_neg();
                b.neg=rand_neg();
-               if (bp == NULL)
-                       for (j=0; j<100; j++)
-                               BN_div(&d,&c,&a,&b,ctx);
                BN_div(&d,&c,&a,&b,ctx);
                if (bp != NULL)
                        {
@@ -431,7 +415,6 @@ int test_div_recp(BIO *bp, BN_CTX *ctx)
        BIGNUM a,b,c,d,e;
        BN_RECP_CTX recp;
        int i;
-       int j;
 
        BN_RECP_CTX_init(&recp);
        BN_init(&a);
@@ -444,19 +427,16 @@ int test_div_recp(BIO *bp, BN_CTX *ctx)
                {
                if (i < num1)
                        {
-                       BN_rand(&a,400,0,0);
+                       BN_bntest_rand(&a,400,0,0);
                        BN_copy(&b,&a);
                        BN_lshift(&a,&a,i);
                        BN_add_word(&a,i);
                        }
                else
-                       BN_rand(&b,50+3*(i-num1),0,0);
+                       BN_bntest_rand(&b,50+3*(i-num1),0,0);
                a.neg=rand_neg();
                b.neg=rand_neg();
                BN_RECP_CTX_set(&recp,&b,ctx);
-               if (bp == NULL)
-                       for (j=0; j<100; j++)
-                               BN_div_recp(&d,&c,&a,&recp,ctx);
                BN_div_recp(&d,&c,&a,&recp,ctx);
                if (bp != NULL)
                        {
@@ -507,7 +487,6 @@ int test_mul(BIO *bp)
        {
        BIGNUM a,b,c,d,e;
        int i;
-       int j;
        BN_CTX ctx;
 
        BN_CTX_init(&ctx);
@@ -521,16 +500,13 @@ int test_mul(BIO *bp)
                {
                if (i <= num1)
                        {
-                       BN_rand(&a,100,0,0);
-                       BN_rand(&b,100,0,0);
+                       BN_bntest_rand(&a,100,0,0);
+                       BN_bntest_rand(&b,100,0,0);
                        }
                else
-                       BN_rand(&b,i-num1,0,0);
+                       BN_bntest_rand(&b,i-num1,0,0);
                a.neg=rand_neg();
                b.neg=rand_neg();
-               if (bp == NULL)
-                       for (j=0; j<100; j++)
-                               BN_mul(&c,&a,&b,&ctx);
                BN_mul(&c,&a,&b,&ctx);
                if (bp != NULL)
                        {
@@ -565,7 +541,6 @@ int test_sqr(BIO *bp, BN_CTX *ctx)
        {
        BIGNUM a,c,d,e;
        int i;
-       int j;
 
        BN_init(&a);
        BN_init(&c);
@@ -574,11 +549,8 @@ int test_sqr(BIO *bp, BN_CTX *ctx)
 
        for (i=0; i<num0; i++)
                {
-               BN_rand(&a,40+i*10,0,0);
+               BN_bntest_rand(&a,40+i*10,0,0);
                a.neg=rand_neg();
-               if (bp == NULL)
-                       for (j=0; j<100; j++)
-                               BN_sqr(&c,&a,ctx);
                BN_sqr(&c,&a,ctx);
                if (bp != NULL)
                        {
@@ -612,7 +584,6 @@ int test_mont(BIO *bp, BN_CTX *ctx)
        BIGNUM a,b,c,d,A,B;
        BIGNUM n;
        int i;
-       int j;
        BN_MONT_CTX *mont;
 
        BN_init(&a);
@@ -625,15 +596,15 @@ int test_mont(BIO *bp, BN_CTX *ctx)
 
        mont=BN_MONT_CTX_new();
 
-       BN_rand(&a,100,0,0); /**/
-       BN_rand(&b,100,0,0); /**/
+       BN_bntest_rand(&a,100,0,0); /**/
+       BN_bntest_rand(&b,100,0,0); /**/
        for (i=0; i<num2; i++)
                {
                int bits = (200*(i+1))/num2;
 
                if (bits == 0)
                        continue;
-               BN_rand(&n,bits,0,1);
+               BN_bntest_rand(&n,bits,0,1);
                BN_MONT_CTX_set(mont,&n,ctx);
 
                BN_nnmod(&a,&a,&n,ctx);
@@ -642,9 +613,6 @@ int test_mont(BIO *bp, BN_CTX *ctx)
                BN_to_montgomery(&A,&a,mont,ctx);
                BN_to_montgomery(&B,&b,mont,ctx);
 
-               if (bp == NULL)
-                       for (j=0; j<100; j++)
-                               BN_mod_mul_montgomery(&c,&A,&B,mont,ctx);/**/
                BN_mod_mul_montgomery(&c,&A,&B,mont,ctx);/**/
                BN_from_montgomery(&A,&c,mont,ctx);/**/
                if (bp != NULL)
@@ -690,7 +658,6 @@ int test_mod(BIO *bp, BN_CTX *ctx)
        {
        BIGNUM *a,*b,*c,*d,*e;
        int i;
-       int j;
 
        a=BN_new();
        b=BN_new();
@@ -698,15 +665,12 @@ int test_mod(BIO *bp, BN_CTX *ctx)
        d=BN_new();
        e=BN_new();
 
-       BN_rand(a,1024,0,0); /**/
+       BN_bntest_rand(a,1024,0,0); /**/
        for (i=0; i<num0; i++)
                {
-               BN_rand(b,450+i*10,0,0); /**/
+               BN_bntest_rand(b,450+i*10,0,0); /**/
                a->neg=rand_neg();
                b->neg=rand_neg();
-               if (bp == NULL)
-                       for (j=0; j<100; j++)
-                               BN_mod(c,a,b,ctx);/**/
                BN_mod(c,a,b,ctx);/**/
                if (bp != NULL)
                        {
@@ -747,17 +711,13 @@ int test_mod_mul(BIO *bp, BN_CTX *ctx)
        d=BN_new();
        e=BN_new();
 
-       BN_rand(c,1024,0,0); /**/
+       BN_bntest_rand(c,1024,0,0); /**/
        for (i=0; i<num0; i++)
                {
-               BN_rand(a,475+i*10,0,0); /**/
-               BN_rand(b,425+i*11,0,0); /**/
+               BN_bntest_rand(a,475+i*10,0,0); /**/
+               BN_bntest_rand(b,425+i*11,0,0); /**/
                a->neg=rand_neg();
                b->neg=rand_neg();
-       /*      if (bp == NULL)
-                       for (j=0; j<100; j++)
-                               BN_mod_mul(d,a,b,c,ctx);*/ /**/
-
                if (!BN_mod_mul(e,a,b,c,ctx))
                        {
                        unsigned long l;
@@ -820,11 +780,11 @@ int test_mod_exp(BIO *bp, BN_CTX *ctx)
        d=BN_new();
        e=BN_new();
 
-       BN_rand(c,30,0,1); /* must be odd for montgomery */
+       BN_bntest_rand(c,30,0,1); /* must be odd for montgomery */
        for (i=0; i<num2; i++)
                {
-               BN_rand(a,20+i*5,0,0); /**/
-               BN_rand(b,2+i,0,0); /**/
+               BN_bntest_rand(a,20+i*5,0,0); /**/
+               BN_bntest_rand(b,2+i,0,0); /**/
 
                if (!BN_mod_exp(d,a,b,c,ctx))
                        return(00);
@@ -874,8 +834,8 @@ int test_exp(BIO *bp, BN_CTX *ctx)
 
        for (i=0; i<num2; i++)
                {
-               BN_rand(a,20+i*5,0,0); /**/
-               BN_rand(b,2+i,0,0); /**/
+               BN_bntest_rand(a,20+i*5,0,0); /**/
+               BN_bntest_rand(b,2+i,0,0); /**/
 
                if (!BN_exp(d,a,b,ctx))
                        return(00);
@@ -946,16 +906,12 @@ int test_kron(BIO *bp, BN_CTX *ctx)
         * don't want to test whether  b  is prime but whether BN_kronecker
         * works.) */
 
-#if 0
        if (!BN_generate_prime(b, 512, 0, NULL, NULL, genprime_cb, NULL)) goto err;
-#else
-       BN_set_word(b,65537);
-#endif
        putc('\n', stderr);
 
        for (i = 0; i < num0; i++)
                {
-               if (!BN_rand(a, 512, 0, 0)) goto err;
+               if (!BN_bntest_rand(a, 512, 0, 0)) goto err;
                a->neg = rand_neg();
 
                /* t := (b-1)/2  (note that b is odd) */
@@ -963,16 +919,12 @@ int test_kron(BIO *bp, BN_CTX *ctx)
                if (!BN_sub_word(t, 1)) goto err;
                if (!BN_rshift1(t, t)) goto err;
                /* r := a^t mod b */
-#if 1
                if (!BN_mod_exp(r, a, t, b, ctx)) goto err;
-#elif 0
-               if (!BN_mod_exp_recp(r, a, t, b, ctx)) goto err;
-#else
-               if (!BN_mod_exp_simple(r, a, t, b, ctx)) goto err;
-#endif
 
                if (BN_is_word(r, 1))
                        legendre = 1;
+               else if (BN_is_zero(r))
+                       legendre = 0;
                else
                        {
                        if (!BN_add_word(r, 1)) goto err;
@@ -983,7 +935,7 @@ int test_kron(BIO *bp, BN_CTX *ctx)
                                }
                        legendre = -1;
                        }
-
+               
                kronecker = BN_kronecker(a, b, ctx);
                if (kronecker < -1) goto err;
                
@@ -991,7 +943,7 @@ int test_kron(BIO *bp, BN_CTX *ctx)
                        {
                        fprintf(stderr, "legendre != kronecker; a = ");
                        BN_print_fp(stderr, a);
-                       fprintf(stderr, ", a = ");
+                       fprintf(stderr, ", b = ");
                        BN_print_fp(stderr, b);
                        fprintf(stderr, "\n");
                        goto err;
@@ -1044,10 +996,10 @@ int test_sqrt(BIO *bp, BN_CTX *ctx)
                        {
                        /* construct 'a' such that it is a square modulo p,
                         * but in general not a proper square and not reduced modulo p */
-                       if (!BN_rand(r, 256, 0, 3)) goto err;
+                       if (!BN_bntest_rand(r, 256, 0, 3)) goto err;
                        if (!BN_nnmod(r, r, p, ctx)) goto err;
                        if (!BN_mod_sqr(r, r, p, ctx)) goto err;
-                       if (!BN_rand(a, 256, 0, 3)) goto err;
+                       if (!BN_bntest_rand(a, 256, 0, 3)) goto err;
                        if (!BN_nnmod(a, a, p, ctx)) goto err;
                        if (!BN_mod_sqr(a, a, p, ctx)) goto err;
                        if (!BN_mul(a, a, r, ctx)) goto err;
@@ -1099,7 +1051,7 @@ int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_)
        else
            {
            a=BN_new();
-           BN_rand(a,200,0,0); /**/
+           BN_bntest_rand(a,200,0,0); /**/
            a->neg=rand_neg();
            }
        for (i=0; i<num0; i++)
@@ -1151,7 +1103,7 @@ int test_lshift1(BIO *bp)
        b=BN_new();
        c=BN_new();
 
-       BN_rand(a,200,0,0); /**/
+       BN_bntest_rand(a,200,0,0); /**/
        a->neg=rand_neg();
        for (i=0; i<num0; i++)
                {
@@ -1195,7 +1147,7 @@ int test_rshift(BIO *bp,BN_CTX *ctx)
        e=BN_new();
        BN_one(c);
 
-       BN_rand(a,200,0,0); /**/
+       BN_bntest_rand(a,200,0,0); /**/
        a->neg=rand_neg();
        for (i=0; i<num0; i++)
                {
@@ -1238,7 +1190,7 @@ int test_rshift1(BIO *bp)
        b=BN_new();
        c=BN_new();
 
-       BN_rand(a,200,0,0); /**/
+       BN_bntest_rand(a,200,0,0); /**/
        a->neg=rand_neg();
        for (i=0; i<num0; i++)
                {
Unnamed repository; edit this file 'description' to name the repository.