Hide BN_CTX structure details.
[openssl.git] / crypto / bn / bntest.c
index c9bd0b877314ecaaa6731bb99c3b5ecb9bdc544f..443cf420e5ce9cd54a2f420676adf465d1b08db0 100644 (file)
@@ -60,7 +60,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "openssl/e_os.h"
+#include "e_os.h"
 
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/x509.h>
 #include <openssl/err.h>
 
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
 #include "../bio/bss_file.c"
 #endif
 
+const int num0 = 100; /* number of tests */
+const int num1 = 50;  /* additional tests for some functions */
+const int num2 = 5;   /* number of tests for slow functions */
+
 int test_add(BIO *bp);
 int test_sub(BIO *bp);
 int test_lshift1(BIO *bp);
@@ -87,24 +91,38 @@ int test_mod(BIO *bp,BN_CTX *ctx);
 int test_mod_mul(BIO *bp,BN_CTX *ctx);
 int test_mod_exp(BIO *bp,BN_CTX *ctx);
 int test_exp(BIO *bp,BN_CTX *ctx);
+int test_kron(BIO *bp,BN_CTX *ctx);
+int test_sqrt(BIO *bp,BN_CTX *ctx);
 int rand_neg(void);
 static int results=0;
 
-#ifdef NO_STDIO
+#ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #include "bss_file.c"
 #endif
 
-static unsigned char lst1[]="\xC6\x4F\x43\x04\x2A\xEA\xCA\x6E\x58\x36\x80\x5B\xE8\xC9"
+static unsigned char lst[]="\xC6\x4F\x43\x04\x2A\xEA\xCA\x6E\x58\x36\x80\x5B\xE8\xC9"
 "\x9B\x04\x5D\x48\x36\xC2\xFD\x16\xC9\x64\xF0";
 
+static const char rnd_seed[] = "string to make the random number generator think it has entropy";
+
+static void message(BIO *out, char *m)
+       {
+       fprintf(stderr, "test %s\n", m);
+       BIO_puts(out, "print \"test ");
+       BIO_puts(out, m);
+       BIO_puts(out, "\\n\"\n");
+       }
+
 int main(int argc, char *argv[])
        {
        BN_CTX *ctx;
        BIO *out;
        char *outfile=NULL;
 
-       srand((unsigned int)time(NULL));
+       results = 0;
+
+       RAND_seed(rnd_seed, sizeof rnd_seed); /* or BN_generate_prime may fail */
 
        argc--;
        argv++;
@@ -143,78 +161,90 @@ int main(int argc, char *argv[])
        if (!results)
                BIO_puts(out,"obase=16\nibase=16\n");
 
-       fprintf(stderr,"test BN_add\n");
+       message(out,"BN_add");
        if (!test_add(out)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_sub\n");
+       message(out,"BN_sub");
        if (!test_sub(out)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_lshift1\n");
+       message(out,"BN_lshift1");
        if (!test_lshift1(out)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_lshift (fixed)\n");
-       if (!test_lshift(out,ctx,BN_bin2bn(lst1,sizeof(lst1)-1,NULL)))
+       message(out,"BN_lshift (fixed)");
+       if (!test_lshift(out,ctx,BN_bin2bn(lst,sizeof(lst)-1,NULL)))
            goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_lshift\n");
+       message(out,"BN_lshift");
        if (!test_lshift(out,ctx,NULL)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_rshift1\n");
+       message(out,"BN_rshift1");
        if (!test_rshift1(out)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_rshift\n");
+       message(out,"BN_rshift");
        if (!test_rshift(out,ctx)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_sqr\n");
+       message(out,"BN_sqr");
        if (!test_sqr(out,ctx)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_mul\n");
+       message(out,"BN_mul");
        if (!test_mul(out)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_div\n");
+       message(out,"BN_div");
        if (!test_div(out,ctx)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_div_recp\n");
+       message(out,"BN_div_recp");
        if (!test_div_recp(out,ctx)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_mod\n");
+       message(out,"BN_mod");
        if (!test_mod(out,ctx)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_mod_mul\n");
+       message(out,"BN_mod_mul");
        if (!test_mod_mul(out,ctx)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-/*
-       fprintf(stderr,"test BN_mont\n");
+       message(out,"BN_mont");
        if (!test_mont(out,ctx)) goto err;
-       fflush(stdout);
-*/
-       fprintf(stderr,"test BN_mod_exp\n");
+       BIO_flush(out);
+
+       message(out,"BN_mod_exp");
        if (!test_mod_exp(out,ctx)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
 
-       fprintf(stderr,"test BN_exp\n");
+       message(out,"BN_exp");
        if (!test_exp(out,ctx)) goto err;
-       fflush(stdout);
+       BIO_flush(out);
+
+       message(out,"BN_kronecker");
+       if (!test_kron(out,ctx)) goto err;
+       BIO_flush(out);
+
+       message(out,"BN_mod_sqrt");
+       if (!test_sqrt(out,ctx)) goto err;
+       BIO_flush(out);
+
+       BN_CTX_free(ctx);
+       BIO_free(out);
 
 /**/
        exit(0);
 err:
-       BIO_puts(out,"1\n"); /* make sure bc fails if we are piping to it */
+       BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices
+                             * the failure, see test_bn in test/Makefile.ssl*/
+       BIO_flush(out);
        ERR_load_crypto_strings();
-       ERR_print_errors(out);
+       ERR_print_errors_fp(stderr);
        exit(1);
        return(1);
        }
@@ -223,21 +253,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);
-       for (i=0; i<100; i++)
+       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)
                        {
@@ -257,7 +283,7 @@ int test_add(BIO *bp)
                BN_add(&c,&c,&a);
                if(!BN_is_zero(&c))
                    {
-                   BIO_puts(bp,"Add test failed!\n");
+                   fprintf(stderr,"Add test failed!\n");
                    return 0;
                    }
                }
@@ -271,21 +297,26 @@ int test_sub(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);
-       for (i=0; i<100; i++)
+       for (i=0; i<num0+num1; i++)
                {
-               BN_rand(&b,400+i,0,0);
-               a.neg=rand_neg();
-               b.neg=rand_neg();
-               if (bp == NULL)
-                       for (j=0; j<10000; j++)
-                               BN_sub(&c,&a,&b);
+               if (i < num1)
+                       {
+                       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_bntest_rand(&b,400+i-num1,0,0);
+                       a.neg=rand_neg();
+                       b.neg=rand_neg();
+                       }
                BN_sub(&c,&a,&b);
                if (bp != NULL)
                        {
@@ -303,7 +334,7 @@ int test_sub(BIO *bp)
                BN_sub(&c,&c,&a);
                if(!BN_is_zero(&c))
                    {
-                   BIO_puts(bp,"Subtract test failed!\n");
+                   fprintf(stderr,"Subtract test failed!\n");
                    return 0;
                    }
                }
@@ -317,7 +348,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);
@@ -325,15 +355,19 @@ int test_div(BIO *bp, BN_CTX *ctx)
        BN_init(&d);
        BN_init(&e);
 
-       BN_rand(&a,400,0,0);
-       for (i=0; i<100; i++)
+       for (i=0; i<num0+num1; i++)
                {
-               BN_rand(&b,50+i,0,0);
+               if (i < num1)
+                       {
+                       BN_bntest_rand(&a,400,0,0);
+                       BN_copy(&b,&a);
+                       BN_lshift(&a,&a,i);
+                       BN_add_word(&a,i);
+                       }
+               else
+                       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)
                        {
@@ -362,7 +396,7 @@ int test_div(BIO *bp, BN_CTX *ctx)
                BN_sub(&d,&d,&a);
                if(!BN_is_zero(&d))
                    {
-                   BIO_puts(bp,"Division test failed!\n");
+                   fprintf(stderr,"Division test failed!\n");
                    return 0;
                    }
                }
@@ -379,7 +413,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);
@@ -388,16 +421,20 @@ int test_div_recp(BIO *bp, BN_CTX *ctx)
        BN_init(&d);
        BN_init(&e);
 
-       BN_rand(&a,400,0,0);
-       for (i=0; i<100; i++)
+       for (i=0; i<num0+num1; i++)
                {
-               BN_rand(&b,50+i,0,0);
+               if (i < num1)
+                       {
+                       BN_bntest_rand(&a,400,0,0);
+                       BN_copy(&b,&a);
+                       BN_lshift(&a,&a,i);
+                       BN_add_word(&a,i);
+                       }
+               else
+                       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)
                        {
@@ -426,7 +463,12 @@ int test_div_recp(BIO *bp, BN_CTX *ctx)
                BN_sub(&d,&d,&a);
                if(!BN_is_zero(&d))
                    {
-                   BIO_puts(bp,"Reciprocal division test failed!\n");
+                   fprintf(stderr,"Reciprocal division test failed!\n");
+                   fprintf(stderr,"a=");
+                   BN_print_fp(stderr,&a);
+                   fprintf(stderr,"\nb=");
+                   BN_print_fp(stderr,&b);
+                   fprintf(stderr,"\n");
                    return 0;
                    }
                }
@@ -443,27 +485,29 @@ int test_mul(BIO *bp)
        {
        BIGNUM a,b,c,d,e;
        int i;
-       int j;
-       BN_CTX ctx;
+       BN_CTX *ctx;
 
-       BN_CTX_init(&ctx);
+       ctx = BN_CTX_new();
+       if (ctx == NULL) exit(1);
+       
        BN_init(&a);
        BN_init(&b);
        BN_init(&c);
        BN_init(&d);
        BN_init(&e);
 
-       BN_rand(&a,200,0,0);
-       for (i=0; i<100; i++)
+       for (i=0; i<num0+num1; i++)
                {
-               BN_rand(&b,250+i,0,0);
-               BN_rand(&b,200,0,0);
+               if (i <= num1)
+                       {
+                       BN_bntest_rand(&a,100,0,0);
+                       BN_bntest_rand(&b,100,0,0);
+                       }
+               else
+                       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);
+               BN_mul(&c,&a,&b,ctx);
                if (bp != NULL)
                        {
                        if (!results)
@@ -476,11 +520,11 @@ int test_mul(BIO *bp)
                        BN_print(bp,&c);
                        BIO_puts(bp,"\n");
                        }
-               BN_div(&d,&e,&c,&a,&ctx);
+               BN_div(&d,&e,&c,&a,ctx);
                BN_sub(&d,&d,&b);
                if(!BN_is_zero(&d) || !BN_is_zero(&e))
                    {
-                   BIO_puts(bp,"Multiplication test failed!\n");
+                   fprintf(stderr,"Multiplication test failed!\n");
                    return 0;
                    }
                }
@@ -489,7 +533,7 @@ int test_mul(BIO *bp)
        BN_free(&c);
        BN_free(&d);
        BN_free(&e);
-       BN_CTX_free(&ctx);
+       BN_CTX_free(ctx);
        return(1);
        }
 
@@ -497,20 +541,16 @@ int test_sqr(BIO *bp, BN_CTX *ctx)
        {
        BIGNUM a,c,d,e;
        int i;
-       int j;
 
        BN_init(&a);
        BN_init(&c);
        BN_init(&d);
        BN_init(&e);
 
-       for (i=0; i<40; i++)
+       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)
                        {
@@ -528,7 +568,7 @@ int test_sqr(BIO *bp, BN_CTX *ctx)
                BN_sub(&d,&d,&a);
                if(!BN_is_zero(&d) || !BN_is_zero(&e))
                    {
-                   BIO_puts(bp,"Square test failed!\n");
+                   fprintf(stderr,"Square test failed!\n");
                    return 0;
                    }
                }
@@ -544,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);
@@ -557,19 +596,23 @@ 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); /**/
-       for (i=0; i<10; i++)
+       BN_bntest_rand(&a,100,0,0); /**/
+       BN_bntest_rand(&b,100,0,0); /**/
+       for (i=0; i<num2; i++)
                {
-               BN_rand(&n,(100%BN_BITS2+1)*BN_BITS2*i*BN_BITS2,0,1); /**/
+               int bits = (200*(i+1))/num2;
+
+               if (bits == 0)
+                       continue;
+               BN_bntest_rand(&n,bits,0,1);
                BN_MONT_CTX_set(mont,&n,ctx);
 
+               BN_nnmod(&a,&a,&n,ctx);
+               BN_nnmod(&b,&b,&n,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)
@@ -596,7 +639,7 @@ BN_num_bits(mont->N));
                BN_sub(&d,&d,&A);
                if(!BN_is_zero(&d))
                    {
-                   BIO_puts(bp,"Montgomery multiplication test failed!\n");
+                   fprintf(stderr,"Montgomery multiplication test failed!\n");
                    return 0;
                    }
                }
@@ -615,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();
@@ -623,15 +665,12 @@ int test_mod(BIO *bp, BN_CTX *ctx)
        d=BN_new();
        e=BN_new();
 
-       BN_rand(a,1024,0,0); /**/
-       for (i=0; i<20; i++)
+       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)
                        {
@@ -649,7 +688,7 @@ int test_mod(BIO *bp, BN_CTX *ctx)
                BN_sub(e,e,c);
                if(!BN_is_zero(e))
                    {
-                   BIO_puts(bp,"Modulo test failed!\n");
+                   fprintf(stderr,"Modulo test failed!\n");
                    return 0;
                    }
                }
@@ -664,7 +703,7 @@ int test_mod(BIO *bp, BN_CTX *ctx)
 int test_mod_mul(BIO *bp, BN_CTX *ctx)
        {
        BIGNUM *a,*b,*c,*d,*e;
-       int i;
+       int i,j;
 
        a=BN_new();
        b=BN_new();
@@ -672,17 +711,14 @@ int test_mod_mul(BIO *bp, BN_CTX *ctx)
        d=BN_new();
        e=BN_new();
 
-       BN_rand(c,1024,0,0); /**/
-       for (i=0; i<10; i++)
+       for (j=0; j<3; j++) {
+       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*10,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;
@@ -701,6 +737,16 @@ int test_mod_mul(BIO *bp, BN_CTX *ctx)
                                BN_print(bp,b);
                                BIO_puts(bp," % ");
                                BN_print(bp,c);
+                               if ((a->neg ^ b->neg) && !BN_is_zero(e))
+                                       {
+                                       /* If  (a*b) % c  is negative,  c  must be added
+                                        * in order to obtain the normalized remainder
+                                        * (new with OpenSSL 0.9.7, previous versions of
+                                        * BN_mod_mul could generate negative results)
+                                        */
+                                       BIO_puts(bp," + ");
+                                       BN_print(bp,c);
+                                       }
                                BIO_puts(bp," - ");
                                }
                        BN_print(bp,e);
@@ -711,10 +757,12 @@ int test_mod_mul(BIO *bp, BN_CTX *ctx)
                BN_div(a,b,d,c,ctx);
                if(!BN_is_zero(b))
                    {
-                   BIO_puts(bp,"Modulo multiply test failed!\n");
+                   fprintf(stderr,"Modulo multiply test failed!\n");
+                   ERR_print_errors_fp(stderr);
                    return 0;
                    }
                }
+       }
        BN_free(a);
        BN_free(b);
        BN_free(c);
@@ -734,11 +782,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 */
-       for (i=0; i<6; i++)
+       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);
@@ -762,7 +810,7 @@ int test_mod_exp(BIO *bp, BN_CTX *ctx)
                BN_div(a,b,e,c,ctx);
                if(!BN_is_zero(b))
                    {
-                   BIO_puts(bp,"Modulo exponentiation test failed!\n");
+                   fprintf(stderr,"Modulo exponentiation test failed!\n");
                    return 0;
                    }
                }
@@ -786,10 +834,10 @@ int test_exp(BIO *bp, BN_CTX *ctx)
        one=BN_new();
        BN_one(one);
 
-       for (i=0; i<6; i++)
+       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);
@@ -812,7 +860,7 @@ int test_exp(BIO *bp, BN_CTX *ctx)
                BN_sub(e,e,d);
                if(!BN_is_zero(e))
                    {
-                   BIO_puts(bp,"Exponentiation test failed!\n");
+                   fprintf(stderr,"Exponentiation test failed!\n");
                    return 0;
                    }
                }
@@ -824,6 +872,183 @@ int test_exp(BIO *bp, BN_CTX *ctx)
        return(1);
        }
 
+static void genprime_cb(int p, int n, void *arg)
+       {
+       char c='*';
+
+       if (p == 0) c='.';
+       if (p == 1) c='+';
+       if (p == 2) c='*';
+       if (p == 3) c='\n';
+       putc(c, stderr);
+       fflush(stderr);
+       (void)n;
+       (void)arg;
+       }
+
+int test_kron(BIO *bp, BN_CTX *ctx)
+       {
+       BIGNUM *a,*b,*r,*t;
+       int i;
+       int legendre, kronecker;
+       int ret = 0;
+
+       a = BN_new();
+       b = BN_new();
+       r = BN_new();
+       t = BN_new();
+       if (a == NULL || b == NULL || r == NULL || t == NULL) goto err;
+       
+       /* We test BN_kronecker(a, b, ctx) just for  b  odd (Jacobi symbol).
+        * In this case we know that if  b  is prime, then BN_kronecker(a, b, ctx)
+        * is congruent to $a^{(b-1)/2}$, modulo $b$ (Legendre symbol).
+        * So we generate a random prime  b  and compare these values
+        * for a number of random  a's.  (That is, we run the Solovay-Strassen
+        * primality test to confirm that  b  is prime, except that we
+        * don't want to test whether  b  is prime but whether BN_kronecker
+        * works.) */
+
+       if (!BN_generate_prime(b, 512, 0, NULL, NULL, genprime_cb, NULL)) goto err;
+       b->neg = rand_neg();
+       putc('\n', stderr);
+
+       for (i = 0; i < num0; i++)
+               {
+               if (!BN_bntest_rand(a, 512, 0, 0)) goto err;
+               a->neg = rand_neg();
+
+               /* t := (|b|-1)/2  (note that b is odd) */
+               if (!BN_copy(t, b)) goto err;
+               t->neg = 0;
+               if (!BN_sub_word(t, 1)) goto err;
+               if (!BN_rshift1(t, t)) goto err;
+               /* r := a^t mod b */
+               b->neg=0;
+               
+               if (!BN_mod_exp_recp(r, a, t, b, ctx)) goto err; /* XXX should be BN_mod_exp_recp, but ..._recp triggers a bug that must be fixed */
+               b->neg=1;
+
+               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;
+                       if (0 != BN_ucmp(r, b))
+                               {
+                               fprintf(stderr, "Legendre symbol computation failed\n");
+                               goto err;
+                               }
+                       legendre = -1;
+                       }
+               
+               kronecker = BN_kronecker(a, b, ctx);
+               if (kronecker < -1) goto err;
+               /* we actually need BN_kronecker(a, |b|) */
+               if (a->neg && b->neg)
+                       kronecker = -kronecker;
+               
+               if (legendre != kronecker)
+                       {
+                       fprintf(stderr, "legendre != kronecker; a = ");
+                       BN_print_fp(stderr, a);
+                       fprintf(stderr, ", b = ");
+                       BN_print_fp(stderr, b);
+                       fprintf(stderr, "\n");
+                       goto err;
+                       }
+
+               putc('.', stderr);
+               fflush(stderr);
+               }
+
+       putc('\n', stderr);
+       fflush(stderr);
+       ret = 1;
+ err:
+       if (a != NULL) BN_free(a);
+       if (b != NULL) BN_free(b);
+       if (r != NULL) BN_free(r);
+       if (t != NULL) BN_free(t);
+       return ret;
+       }
+
+int test_sqrt(BIO *bp, BN_CTX *ctx)
+       {
+       BIGNUM *a,*p,*r;
+       int i, j;
+       int ret = 0;
+
+       a = BN_new();
+       p = BN_new();
+       r = BN_new();
+       if (a == NULL || p == NULL || r == NULL) goto err;
+       
+       for (i = 0; i < 16; i++)
+               {
+               if (i < 8)
+                       {
+                       unsigned primes[8] = { 2, 3, 5, 7, 11, 13, 17, 19 };
+                       
+                       if (!BN_set_word(p, primes[i])) goto err;
+                       }
+               else
+                       {
+                       if (!BN_set_word(a, 32)) goto err;
+                       if (!BN_set_word(r, 2*i + 1)) goto err;
+               
+                       if (!BN_generate_prime(p, 256, 0, a, r, genprime_cb, NULL)) goto err;
+                       putc('\n', stderr);
+                       }
+               p->neg = rand_neg();
+
+               for (j = 0; j < num2; j++)
+                       {
+                       /* construct 'a' such that it is a square modulo p,
+                        * but in general not a proper square and not reduced modulo p */
+                       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_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;
+                       if (rand_neg())
+                               if (!BN_sub(a, a, p)) goto err;
+
+                       if (!BN_mod_sqrt(r, a, p, ctx)) goto err;
+                       if (!BN_mod_sqr(r, r, p, ctx)) goto err;
+
+                       if (!BN_nnmod(a, a, p, ctx)) goto err;
+
+                       if (BN_cmp(a, r) != 0)
+                               {
+                               fprintf(stderr, "BN_mod_sqrt failed: a = ");
+                               BN_print_fp(stderr, a);
+                               fprintf(stderr, ", r = ");
+                               BN_print_fp(stderr, r);
+                               fprintf(stderr, ", p = ");
+                               BN_print_fp(stderr, p);
+                               fprintf(stderr, "\n");
+                               goto err;
+                               }
+
+                       putc('.', stderr);
+                       fflush(stderr);
+                       }
+               
+               putc('\n', stderr);
+               fflush(stderr);
+               }
+       ret = 1;
+ err:
+       if (a != NULL) BN_free(a);
+       if (p != NULL) BN_free(p);
+       if (r != NULL) BN_free(r);
+       return ret;
+       }
+
 int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_)
        {
        BIGNUM *a,*b,*c,*d;
@@ -839,10 +1064,10 @@ 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<70; i++)
+       for (i=0; i<num0; i++)
                {
                BN_lshift(b,a,i+1);
                BN_add(c,c,c);
@@ -862,16 +1087,16 @@ int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_)
                BN_sub(d,d,b);
                if(!BN_is_zero(d))
                    {
-                   BIO_puts(bp,"Left shift test failed!\n");
-                   BIO_puts(bp,"a=");
-                   BN_print(bp,a);
-                   BIO_puts(bp,"\nb=");
-                   BN_print(bp,b);
-                   BIO_puts(bp,"\nc=");
-                   BN_print(bp,c);
-                   BIO_puts(bp,"\nd=");
-                   BN_print(bp,d);
-                   BIO_puts(bp,"\n");
+                   fprintf(stderr,"Left shift test failed!\n");
+                   fprintf(stderr,"a=");
+                   BN_print_fp(stderr,a);
+                   fprintf(stderr,"\nb=");
+                   BN_print_fp(stderr,b);
+                   fprintf(stderr,"\nc=");
+                   BN_print_fp(stderr,c);
+                   fprintf(stderr,"\nd=");
+                   BN_print_fp(stderr,d);
+                   fprintf(stderr,"\n");
                    return 0;
                    }
                }
@@ -891,9 +1116,9 @@ 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<70; i++)
+       for (i=0; i<num0; i++)
                {
                BN_lshift1(b,a);
                if (bp != NULL)
@@ -911,7 +1136,7 @@ int test_lshift1(BIO *bp)
                BN_sub(a,b,c);
                if(!BN_is_zero(a))
                    {
-                   BIO_puts(bp,"Left shift one test failed!\n");
+                   fprintf(stderr,"Left shift one test failed!\n");
                    return 0;
                    }
                
@@ -935,9 +1160,9 @@ 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<70; i++)
+       for (i=0; i<num0; i++)
                {
                BN_rshift(b,a,i+1);
                BN_add(c,c,c);
@@ -957,7 +1182,7 @@ int test_rshift(BIO *bp,BN_CTX *ctx)
                BN_sub(d,d,b);
                if(!BN_is_zero(d))
                    {
-                   BIO_puts(bp,"Right shift test failed!\n");
+                   fprintf(stderr,"Right shift test failed!\n");
                    return 0;
                    }
                }
@@ -978,9 +1203,9 @@ 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<70; i++)
+       for (i=0; i<num0; i++)
                {
                BN_rshift1(b,a);
                if (bp != NULL)
@@ -996,9 +1221,9 @@ int test_rshift1(BIO *bp)
                        }
                BN_sub(c,a,b);
                BN_sub(c,c,b);
-               if(!BN_is_zero(c) && !BN_is_one(c))
+               if(!BN_is_zero(c) && !BN_abs_is_word(c, 1))
                    {
-                   BIO_puts(bp,"Right shift one test failed!\n");
+                   fprintf(stderr,"Right shift one test failed!\n");
                    return 0;
                    }
                BN_copy(a,b);