Remove redundant OPENSSL_NO_DEPRECATED suppression
[openssl.git] / crypto / bn / bntest.c
index c9bd0b877314ecaaa6731bb99c3b5ecb9bdc544f..0fa2504cebc165d58fbb24e11f54e65d535134b2 100644 (file)
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * Portions of the attached software ("Contribution") are developed by 
+ * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+ *
+ * The Contribution is licensed pursuant to the Eric Young open source
+ * license provided above.
+ *
+ * The binary polynomial arithmetic software is originally written by 
+ * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
 
 #include <stdio.h>
 #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
-#include "../bio/bss_file.c"
-#endif
+#include "../crypto/bn/bn_lcl.h"
+
+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);
@@ -79,6 +94,7 @@ int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_);
 int test_rshift1(BIO *bp);
 int test_rshift(BIO *bp,BN_CTX *ctx);
 int test_div(BIO *bp,BN_CTX *ctx);
+int test_div_word(BIO *bp);
 int test_div_recp(BIO *bp,BN_CTX *ctx);
 int test_mul(BIO *bp);
 int test_sqr(BIO *bp,BN_CTX *ctx);
@@ -86,25 +102,47 @@ int test_mont(BIO *bp,BN_CTX *ctx);
 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_mod_exp_mont_consttime(BIO *bp,BN_CTX *ctx);
+int test_mod_exp_mont5(BIO *bp, BN_CTX *ctx);
 int test_exp(BIO *bp,BN_CTX *ctx);
+int test_gf2m_add(BIO *bp);
+int test_gf2m_mod(BIO *bp);
+int test_gf2m_mod_mul(BIO *bp,BN_CTX *ctx);
+int test_gf2m_mod_sqr(BIO *bp,BN_CTX *ctx);
+int test_gf2m_mod_inv(BIO *bp,BN_CTX *ctx);
+int test_gf2m_mod_div(BIO *bp,BN_CTX *ctx);
+int test_gf2m_mod_exp(BIO *bp,BN_CTX *ctx);
+int test_gf2m_mod_sqrt(BIO *bp,BN_CTX *ctx);
+int test_gf2m_mod_solve_quad(BIO *bp,BN_CTX *ctx);
+int test_kron(BIO *bp,BN_CTX *ctx);
+int test_sqrt(BIO *bp,BN_CTX *ctx);
+int test_small_prime(BIO *bp,BN_CTX *ctx);
+int test_probable_prime_coprime(BIO *bp,BN_CTX *ctx);
 int rand_neg(void);
 static int results=0;
 
-#ifdef 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++;
@@ -123,10 +161,10 @@ int main(int argc, char *argv[])
 
 
        ctx=BN_CTX_new();
-       if (ctx == NULL) exit(1);
+       if (ctx == NULL) EXIT(1);
 
        out=BIO_new(BIO_s_file());
-       if (out == NULL) exit(1);
+       if (out == NULL) EXIT(1);
        if (outfile == NULL)
                {
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
@@ -136,86 +174,156 @@ int main(int argc, char *argv[])
                if (!BIO_write_filename(out,outfile))
                        {
                        perror(outfile);
-                       exit(1);
+                       EXIT(1);
                        }
                }
 
        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);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_sub\n");
+       message(out,"BN_sub");
        if (!test_sub(out)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_lshift1\n");
+       message(out,"BN_lshift1");
        if (!test_lshift1(out)) goto err;
-       fflush(stdout);
+       (void)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);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_lshift\n");
+       message(out,"BN_lshift");
        if (!test_lshift(out,ctx,NULL)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_rshift1\n");
+       message(out,"BN_rshift1");
        if (!test_rshift1(out)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_rshift\n");
+       message(out,"BN_rshift");
        if (!test_rshift(out,ctx)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_sqr\n");
+       message(out,"BN_sqr");
        if (!test_sqr(out,ctx)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_mul\n");
+       message(out,"BN_mul");
        if (!test_mul(out)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_div\n");
+       message(out,"BN_div");
        if (!test_div(out,ctx)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_div_recp\n");
+       message(out,"BN_div_word");
+       if (!test_div_word(out)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_div_recp");
        if (!test_div_recp(out,ctx)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_mod\n");
+       message(out,"BN_mod");
        if (!test_mod(out,ctx)) goto err;
-       fflush(stdout);
+       (void)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);
+       (void)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");
+       (void)BIO_flush(out);
+
+       message(out,"BN_mod_exp");
        if (!test_mod_exp(out,ctx)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
 
-       fprintf(stderr,"test BN_exp\n");
+       message(out,"BN_mod_exp_mont_consttime");
+       if (!test_mod_exp_mont_consttime(out,ctx)) goto err;
+       if (!test_mod_exp_mont5(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_exp");
        if (!test_exp(out,ctx)) goto err;
-       fflush(stdout);
+       (void)BIO_flush(out);
+
+       message(out,"BN_kronecker");
+       if (!test_kron(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_mod_sqrt");
+       if (!test_sqrt(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"Small prime generation");
+       if (!test_small_prime(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+#ifdef OPENSSL_SYS_WIN32
+       message(out,"Probable prime generation with coprimes disabled");
+#else
+       message(out,"Probable prime generation with coprimes");
+       if (!test_probable_prime_coprime(out,ctx)) goto err;
+#endif
+       (void)BIO_flush(out);
+
+#ifndef OPENSSL_NO_EC2M
+       message(out,"BN_GF2m_add");
+       if (!test_gf2m_add(out)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_GF2m_mod");
+       if (!test_gf2m_mod(out)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_GF2m_mod_mul");
+       if (!test_gf2m_mod_mul(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_GF2m_mod_sqr");
+       if (!test_gf2m_mod_sqr(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_GF2m_mod_inv");
+       if (!test_gf2m_mod_inv(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_GF2m_mod_div");
+       if (!test_gf2m_mod_div(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_GF2m_mod_exp");
+       if (!test_gf2m_mod_exp(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_GF2m_mod_sqrt");
+       if (!test_gf2m_mod_sqrt(out,ctx)) goto err;
+       (void)BIO_flush(out);
+
+       message(out,"BN_GF2m_mod_solve_quad");
+       if (!test_gf2m_mod_solve_quad(out,ctx)) goto err;
+       (void)BIO_flush(out);
+#endif
+       BN_CTX_free(ctx);
+       BIO_free(out);
 
 /**/
-       exit(0);
+       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*/
+       (void)BIO_flush(out);
        ERR_load_crypto_strings();
-       ERR_print_errors(out);
-       exit(1);
+       ERR_print_errors_fp(stderr);
+       EXIT(1);
        return(1);
        }
 
@@ -223,21 +331,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 +361,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 +375,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 +412,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 +426,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 +433,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 +474,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;
                    }
                }
@@ -374,12 +486,83 @@ int test_div(BIO *bp, BN_CTX *ctx)
        return(1);
        }
 
+static void print_word(BIO *bp,BN_ULONG w)
+       {
+#ifdef SIXTY_FOUR_BIT
+       if (sizeof(w) > sizeof(unsigned long))
+               {
+               unsigned long   h=(unsigned long)(w>>32),
+                               l=(unsigned long)(w);
+
+               if (h)  BIO_printf(bp,"%lX%08lX",h,l);
+               else    BIO_printf(bp,"%lX",l);
+               return;
+               }
+#endif
+       BIO_printf(bp,BN_HEX_FMT1,w);
+       }
+
+int test_div_word(BIO *bp)
+       {
+       BIGNUM   a,b;
+       BN_ULONG r,s;
+       int i;
+
+       BN_init(&a);
+       BN_init(&b);
+
+       for (i=0; i<num0; i++)
+               {
+               do {
+                       BN_bntest_rand(&a,512,-1,0);
+                       BN_bntest_rand(&b,BN_BITS2,-1,0);
+                       s = b.d[0];
+               } while (!s);
+
+               BN_copy(&b, &a);
+               r = BN_div_word(&b, s);
+
+               if (bp != NULL)
+                       {
+                       if (!results)
+                               {
+                               BN_print(bp,&a);
+                               BIO_puts(bp," / ");
+                               print_word(bp,s);
+                               BIO_puts(bp," - ");
+                               }
+                       BN_print(bp,&b);
+                       BIO_puts(bp,"\n");
+
+                       if (!results)
+                               {
+                               BN_print(bp,&a);
+                               BIO_puts(bp," % ");
+                               print_word(bp,s);
+                               BIO_puts(bp," - ");
+                               }
+                       print_word(bp,r);
+                       BIO_puts(bp,"\n");
+                       }
+               BN_mul_word(&b,s);
+               BN_add_word(&b,r);
+               BN_sub(&b,&a,&b);
+               if(!BN_is_zero(&b))
+                   {
+                   fprintf(stderr,"Division (word) test failed!\n");
+                   return 0;
+                   }
+               }
+       BN_free(&a);
+       BN_free(&b);
+       return(1);
+       }
+
 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 +571,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 +613,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 +635,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 +670,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 +683,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 +691,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 +718,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 +734,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);
@@ -556,20 +745,26 @@ int test_mont(BIO *bp, BN_CTX *ctx)
        BN_init(&n);
 
        mont=BN_MONT_CTX_new();
+       if (mont == NULL)
+               return 0;
 
-       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 +791,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 +810,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 +817,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 +840,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 +855,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 +863,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;
@@ -690,7 +878,7 @@ int test_mod_mul(BIO *bp, BN_CTX *ctx)
                        while ((l=ERR_get_error()))
                                fprintf(stderr,"ERROR:%s\n",
                                        ERR_error_string(l,NULL));
-                       exit(1);
+                       EXIT(1);
                        }
                if (bp != NULL)
                        {
@@ -701,6 +889,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 +909,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,13 +934,64 @@ 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(0);
+
+               if (bp != NULL)
+                       {
+                       if (!results)
+                               {
+                               BN_print(bp,a);
+                               BIO_puts(bp," ^ ");
+                               BN_print(bp,b);
+                               BIO_puts(bp," % ");
+                               BN_print(bp,c);
+                               BIO_puts(bp," - ");
+                               }
+                       BN_print(bp,d);
+                       BIO_puts(bp,"\n");
+                       }
+               BN_exp(e,a,b,ctx);
+               BN_sub(e,e,d);
+               BN_div(a,b,e,c,ctx);
+               if(!BN_is_zero(b))
+                   {
+                   fprintf(stderr,"Modulo exponentiation test failed!\n");
+                   return 0;
+                   }
+               }
+       BN_free(a);
+       BN_free(b);
+       BN_free(c);
+       BN_free(d);
+       BN_free(e);
+       return(1);
+       }
+
+int test_mod_exp_mont_consttime(BIO *bp, BN_CTX *ctx)
+       {
+       BIGNUM *a,*b,*c,*d,*e;
+       int i;
+
+       a=BN_new();
+       b=BN_new();
+       c=BN_new();
+       d=BN_new();
+       e=BN_new();
+
+       BN_bntest_rand(c,30,0,1); /* must be odd for montgomery */
+       for (i=0; i<num2; i++)
+               {
+               BN_bntest_rand(a,20+i*5,0,0); /**/
+               BN_bntest_rand(b,2+i,0,0); /**/
+
+               if (!BN_mod_exp_mont_consttime(d,a,b,c,ctx,NULL))
                        return(00);
 
                if (bp != NULL)
@@ -762,7 +1013,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;
                    }
                }
@@ -774,6 +1025,80 @@ int test_mod_exp(BIO *bp, BN_CTX *ctx)
        return(1);
        }
 
+/* Test constant-time modular exponentiation with 1024-bit inputs,
+ * which on x86_64 cause a different code branch to be taken.
+ */
+int test_mod_exp_mont5(BIO *bp, BN_CTX *ctx)
+       {
+       BIGNUM *a,*p,*m,*d,*e;
+
+       BN_MONT_CTX *mont;
+
+       a=BN_new();
+       p=BN_new();
+       m=BN_new();
+       d=BN_new();
+       e=BN_new();
+
+       mont = BN_MONT_CTX_new();
+
+       BN_bntest_rand(m,1024,0,1); /* must be odd for montgomery */
+       /* Zero exponent */
+       BN_bntest_rand(a,1024,0,0);
+       BN_zero(p);
+       if(!BN_mod_exp_mont_consttime(d,a,p,m,ctx,NULL))
+               return 0;
+       if(!BN_is_one(d))
+               {
+               fprintf(stderr, "Modular exponentiation test failed!\n");
+               return 0;
+               }
+       /* Zero input */
+       BN_bntest_rand(p,1024,0,0);
+       BN_zero(a);
+       if(!BN_mod_exp_mont_consttime(d,a,p,m,ctx,NULL))
+               return 0;
+       if(!BN_is_zero(d))
+               {
+               fprintf(stderr, "Modular exponentiation test failed!\n");
+               return 0;
+               }
+       /* Craft an input whose Montgomery representation is 1,
+        * i.e., shorter than the modulus m, in order to test
+        * the const time precomputation scattering/gathering.
+        */
+       BN_one(a);
+       BN_MONT_CTX_set(mont,m,ctx);
+       if(!BN_from_montgomery(e,a,mont,ctx))
+               return 0;
+       if(!BN_mod_exp_mont_consttime(d,e,p,m,ctx,NULL))
+               return 0;
+       if(!BN_mod_exp_simple(a,e,p,m,ctx))
+               return 0;
+       if(BN_cmp(a,d) != 0)
+               {
+               fprintf(stderr,"Modular exponentiation test failed!\n");
+               return 0;
+               }
+       /* Finally, some regular test vectors. */
+       BN_bntest_rand(e,1024,0,0);
+       if(!BN_mod_exp_mont_consttime(d,e,p,m,ctx,NULL))
+               return 0;
+       if(!BN_mod_exp_simple(a,e,p,m,ctx))
+               return 0;
+       if(BN_cmp(a,d) != 0)
+               {
+               fprintf(stderr,"Modular exponentiation test failed!\n");
+               return 0;
+               }
+       BN_free(a);
+       BN_free(p);
+       BN_free(m);
+       BN_free(d);
+       BN_free(e);
+       return(1);
+       }
+
 int test_exp(BIO *bp, BN_CTX *ctx)
        {
        BIGNUM *a,*b,*d,*e,*one;
@@ -786,13 +1111,13 @@ 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);
+               if (BN_exp(d,a,b,ctx) <= 0)
+                       return(0);
 
                if (bp != NULL)
                        {
@@ -812,7 +1137,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;
                    }
                }
@@ -823,7 +1148,817 @@ int test_exp(BIO *bp, BN_CTX *ctx)
        BN_free(one);
        return(1);
        }
+#ifndef OPENSSL_NO_EC2M
+int test_gf2m_add(BIO *bp)
+       {
+       BIGNUM a,b,c;
+       int i, ret = 0;
+
+       BN_init(&a);
+       BN_init(&b);
+       BN_init(&c);
+
+       for (i=0; i<num0; i++)
+               {
+               BN_rand(&a,512,0,0);
+               BN_copy(&b, BN_value_one());
+               a.neg=rand_neg();
+               b.neg=rand_neg();
+               BN_GF2m_add(&c,&a,&b);
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+               if (bp != NULL)
+                       {
+                       if (!results)
+                               {
+                               BN_print(bp,&a);
+                               BIO_puts(bp," ^ ");
+                               BN_print(bp,&b);
+                               BIO_puts(bp," = ");
+                               }
+                       BN_print(bp,&c);
+                       BIO_puts(bp,"\n");
+                       }
+#endif
+               /* Test that two added values have the correct parity. */
+               if((BN_is_odd(&a) && BN_is_odd(&c)) || (!BN_is_odd(&a) && !BN_is_odd(&c)))
+                       {
+                   fprintf(stderr,"GF(2^m) addition test (a) failed!\n");
+                       goto err;
+                       }
+               BN_GF2m_add(&c,&c,&c);
+               /* Test that c + c = 0. */
+               if(!BN_is_zero(&c))
+                   {
+                   fprintf(stderr,"GF(2^m) addition test (b) failed!\n");
+                       goto err;
+                   }
+               }
+       ret = 1;
+  err:
+       BN_free(&a);
+       BN_free(&b);
+       BN_free(&c);
+       return ret;
+       }
+
+int test_gf2m_mod(BIO *bp)
+       {
+       BIGNUM *a,*b[2],*c,*d,*e;
+       int i, j, ret = 0;
+       int p0[] = {163,7,6,3,0,-1};
+       int p1[] = {193,15,0,-1};
+
+       a=BN_new();
+       b[0]=BN_new();
+       b[1]=BN_new();
+       c=BN_new();
+       d=BN_new();
+       e=BN_new();
+
+       BN_GF2m_arr2poly(p0, b[0]);
+       BN_GF2m_arr2poly(p1, b[1]);
+
+       for (i=0; i<num0; i++)
+               {
+               BN_bntest_rand(a, 1024, 0, 0);
+               for (j=0; j < 2; j++)
+                       {
+                       BN_GF2m_mod(c, a, b[j]);
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+                       if (bp != NULL)
+                               {
+                               if (!results)
+                                       {
+                                       BN_print(bp,a);
+                                       BIO_puts(bp," % ");
+                                       BN_print(bp,b[j]);
+                                       BIO_puts(bp," - ");
+                                       BN_print(bp,c);
+                                       BIO_puts(bp,"\n");
+                                       }
+                               }
+#endif
+                       BN_GF2m_add(d, a, c);
+                       BN_GF2m_mod(e, d, b[j]);
+                       /* Test that a + (a mod p) mod p == 0. */
+                       if(!BN_is_zero(e))
+                               {
+                               fprintf(stderr,"GF(2^m) modulo test failed!\n");
+                               goto err;
+                               }
+                       }
+               }
+       ret = 1;
+  err:
+       BN_free(a);
+       BN_free(b[0]);
+       BN_free(b[1]);
+       BN_free(c);
+       BN_free(d);
+       BN_free(e);
+       return ret;
+       }
+
+int test_gf2m_mod_mul(BIO *bp,BN_CTX *ctx)
+       {
+       BIGNUM *a,*b[2],*c,*d,*e,*f,*g,*h;
+       int i, j, ret = 0;
+       int p0[] = {163,7,6,3,0,-1};
+       int p1[] = {193,15,0,-1};
+
+       a=BN_new();
+       b[0]=BN_new();
+       b[1]=BN_new();
+       c=BN_new();
+       d=BN_new();
+       e=BN_new();
+       f=BN_new();
+       g=BN_new();
+       h=BN_new();
+
+       BN_GF2m_arr2poly(p0, b[0]);
+       BN_GF2m_arr2poly(p1, b[1]);
+
+       for (i=0; i<num0; i++)
+               {
+               BN_bntest_rand(a, 1024, 0, 0);
+               BN_bntest_rand(c, 1024, 0, 0);
+               BN_bntest_rand(d, 1024, 0, 0);
+               for (j=0; j < 2; j++)
+                       {
+                       BN_GF2m_mod_mul(e, a, c, b[j], ctx);
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+                       if (bp != NULL)
+                               {
+                               if (!results)
+                                       {
+                                       BN_print(bp,a);
+                                       BIO_puts(bp," * ");
+                                       BN_print(bp,c);
+                                       BIO_puts(bp," % ");
+                                       BN_print(bp,b[j]);
+                                       BIO_puts(bp," - ");
+                                       BN_print(bp,e);
+                                       BIO_puts(bp,"\n");
+                                       }
+                               }
+#endif
+                       BN_GF2m_add(f, a, d);
+                       BN_GF2m_mod_mul(g, f, c, b[j], ctx);
+                       BN_GF2m_mod_mul(h, d, c, b[j], ctx);
+                       BN_GF2m_add(f, e, g);
+                       BN_GF2m_add(f, f, h);
+                       /* Test that (a+d)*c = a*c + d*c. */
+                       if(!BN_is_zero(f))
+                               {
+                               fprintf(stderr,"GF(2^m) modular multiplication test failed!\n");
+                               goto err;
+                               }
+                       }
+               }
+       ret = 1;
+  err:
+       BN_free(a);
+       BN_free(b[0]);
+       BN_free(b[1]);
+       BN_free(c);
+       BN_free(d);
+       BN_free(e);
+       BN_free(f);
+       BN_free(g);
+       BN_free(h);
+       return ret;
+       }
+
+int test_gf2m_mod_sqr(BIO *bp,BN_CTX *ctx)
+       {
+       BIGNUM *a,*b[2],*c,*d;
+       int i, j, ret = 0;
+       int p0[] = {163,7,6,3,0,-1};
+       int p1[] = {193,15,0,-1};
+
+       a=BN_new();
+       b[0]=BN_new();
+       b[1]=BN_new();
+       c=BN_new();
+       d=BN_new();
+
+       BN_GF2m_arr2poly(p0, b[0]);
+       BN_GF2m_arr2poly(p1, b[1]);
+
+       for (i=0; i<num0; i++)
+               {
+               BN_bntest_rand(a, 1024, 0, 0);
+               for (j=0; j < 2; j++)
+                       {
+                       BN_GF2m_mod_sqr(c, a, b[j], ctx);
+                       BN_copy(d, a);
+                       BN_GF2m_mod_mul(d, a, d, b[j], ctx);
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+                       if (bp != NULL)
+                               {
+                               if (!results)
+                                       {
+                                       BN_print(bp,a);
+                                       BIO_puts(bp," ^ 2 % ");
+                                       BN_print(bp,b[j]);
+                                       BIO_puts(bp, " = ");
+                                       BN_print(bp,c);
+                                       BIO_puts(bp,"; a * a = ");
+                                       BN_print(bp,d);
+                                       BIO_puts(bp,"\n");
+                                       }
+                               }
+#endif
+                       BN_GF2m_add(d, c, d);
+                       /* Test that a*a = a^2. */
+                       if(!BN_is_zero(d))
+                               {
+                               fprintf(stderr,"GF(2^m) modular squaring test failed!\n");
+                               goto err;
+                               }
+                       }
+               }
+       ret = 1;
+  err:
+       BN_free(a);
+       BN_free(b[0]);
+       BN_free(b[1]);
+       BN_free(c);
+       BN_free(d);
+       return ret;
+       }
+
+int test_gf2m_mod_inv(BIO *bp,BN_CTX *ctx)
+       {
+       BIGNUM *a,*b[2],*c,*d;
+       int i, j, ret = 0;
+       int p0[] = {163,7,6,3,0,-1};
+       int p1[] = {193,15,0,-1};
+
+       a=BN_new();
+       b[0]=BN_new();
+       b[1]=BN_new();
+       c=BN_new();
+       d=BN_new();
+
+       BN_GF2m_arr2poly(p0, b[0]);
+       BN_GF2m_arr2poly(p1, b[1]);
+
+       for (i=0; i<num0; i++)
+               {
+               BN_bntest_rand(a, 512, 0, 0); 
+               for (j=0; j < 2; j++)
+                       {
+                       BN_GF2m_mod_inv(c, a, b[j], ctx);
+                       BN_GF2m_mod_mul(d, a, c, b[j], ctx);
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+                       if (bp != NULL)
+                               {
+                               if (!results)
+                                       {
+                                       BN_print(bp,a);
+                                       BIO_puts(bp, " * ");
+                                       BN_print(bp,c);
+                                       BIO_puts(bp," - 1 % ");
+                                       BN_print(bp,b[j]);
+                                       BIO_puts(bp,"\n");
+                                       }
+                               }
+#endif
+                       /* Test that ((1/a)*a) = 1. */
+                       if(!BN_is_one(d))
+                               {
+                               fprintf(stderr,"GF(2^m) modular inversion test failed!\n");
+                               goto err;
+                               }
+                       }
+               }
+       ret = 1;
+  err:
+       BN_free(a);
+       BN_free(b[0]);
+       BN_free(b[1]);
+       BN_free(c);
+       BN_free(d);
+       return ret;
+       }
+
+int test_gf2m_mod_div(BIO *bp,BN_CTX *ctx)
+       {
+       BIGNUM *a,*b[2],*c,*d,*e,*f;
+       int i, j, ret = 0;
+       int p0[] = {163,7,6,3,0,-1};
+       int p1[] = {193,15,0,-1};
+
+       a=BN_new();
+       b[0]=BN_new();
+       b[1]=BN_new();
+       c=BN_new();
+       d=BN_new();
+       e=BN_new();
+       f=BN_new();
+
+       BN_GF2m_arr2poly(p0, b[0]);
+       BN_GF2m_arr2poly(p1, b[1]);
 
+       for (i=0; i<num0; i++)
+               {
+               BN_bntest_rand(a, 512, 0, 0); 
+               BN_bntest_rand(c, 512, 0, 0);
+               for (j=0; j < 2; j++)
+                       {
+                       BN_GF2m_mod_div(d, a, c, b[j], ctx);
+                       BN_GF2m_mod_mul(e, d, c, b[j], ctx);
+                       BN_GF2m_mod_div(f, a, e, b[j], ctx);
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+                       if (bp != NULL)
+                               {
+                               if (!results)
+                                       {
+                                       BN_print(bp,a);
+                                       BIO_puts(bp, " = ");
+                                       BN_print(bp,c);
+                                       BIO_puts(bp," * ");
+                                       BN_print(bp,d);
+                                       BIO_puts(bp, " % ");
+                                       BN_print(bp,b[j]);
+                                       BIO_puts(bp,"\n");
+                                       }
+                               }
+#endif
+                       /* Test that ((a/c)*c)/a = 1. */
+                       if(!BN_is_one(f))
+                               {
+                               fprintf(stderr,"GF(2^m) modular division test failed!\n");
+                               goto err;
+                               }
+                       }
+               }
+       ret = 1;
+  err:
+       BN_free(a);
+       BN_free(b[0]);
+       BN_free(b[1]);
+       BN_free(c);
+       BN_free(d);
+       BN_free(e);
+       BN_free(f);
+       return ret;
+       }
+
+int test_gf2m_mod_exp(BIO *bp,BN_CTX *ctx)
+       {
+       BIGNUM *a,*b[2],*c,*d,*e,*f;
+       int i, j, ret = 0;
+       int p0[] = {163,7,6,3,0,-1};
+       int p1[] = {193,15,0,-1};
+
+       a=BN_new();
+       b[0]=BN_new();
+       b[1]=BN_new();
+       c=BN_new();
+       d=BN_new();
+       e=BN_new();
+       f=BN_new();
+
+       BN_GF2m_arr2poly(p0, b[0]);
+       BN_GF2m_arr2poly(p1, b[1]);
+
+       for (i=0; i<num0; i++)
+               {
+               BN_bntest_rand(a, 512, 0, 0);
+               BN_bntest_rand(c, 512, 0, 0);
+               BN_bntest_rand(d, 512, 0, 0);
+               for (j=0; j < 2; j++)
+                       {
+                       BN_GF2m_mod_exp(e, a, c, b[j], ctx);
+                       BN_GF2m_mod_exp(f, a, d, b[j], ctx);
+                       BN_GF2m_mod_mul(e, e, f, b[j], ctx);
+                       BN_add(f, c, d);
+                       BN_GF2m_mod_exp(f, a, f, b[j], ctx);
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+                       if (bp != NULL)
+                               {
+                               if (!results)
+                                       {
+                                       BN_print(bp,a);
+                                       BIO_puts(bp, " ^ (");
+                                       BN_print(bp,c);
+                                       BIO_puts(bp," + ");
+                                       BN_print(bp,d);
+                                       BIO_puts(bp, ") = ");
+                                       BN_print(bp,e);
+                                       BIO_puts(bp, "; - ");
+                                       BN_print(bp,f);
+                                       BIO_puts(bp, " % ");
+                                       BN_print(bp,b[j]);
+                                       BIO_puts(bp,"\n");
+                                       }
+                               }
+#endif
+                       BN_GF2m_add(f, e, f);
+                       /* Test that a^(c+d)=a^c*a^d. */
+                       if(!BN_is_zero(f))
+                               {
+                               fprintf(stderr,"GF(2^m) modular exponentiation test failed!\n");
+                               goto err;
+                               }
+                       }
+               }
+       ret = 1;
+  err:
+       BN_free(a);
+       BN_free(b[0]);
+       BN_free(b[1]);
+       BN_free(c);
+       BN_free(d);
+       BN_free(e);
+       BN_free(f);
+       return ret;
+       }
+
+int test_gf2m_mod_sqrt(BIO *bp,BN_CTX *ctx)
+       {
+       BIGNUM *a,*b[2],*c,*d,*e,*f;
+       int i, j, ret = 0;
+       int p0[] = {163,7,6,3,0,-1};
+       int p1[] = {193,15,0,-1};
+
+       a=BN_new();
+       b[0]=BN_new();
+       b[1]=BN_new();
+       c=BN_new();
+       d=BN_new();
+       e=BN_new();
+       f=BN_new();
+
+       BN_GF2m_arr2poly(p0, b[0]);
+       BN_GF2m_arr2poly(p1, b[1]);
+
+       for (i=0; i<num0; i++)
+               {
+               BN_bntest_rand(a, 512, 0, 0);
+               for (j=0; j < 2; j++)
+                       {
+                       BN_GF2m_mod(c, a, b[j]);
+                       BN_GF2m_mod_sqrt(d, a, b[j], ctx);
+                       BN_GF2m_mod_sqr(e, d, b[j], ctx);
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+                       if (bp != NULL)
+                               {
+                               if (!results)
+                                       {
+                                       BN_print(bp,d);
+                                       BIO_puts(bp, " ^ 2 - ");
+                                       BN_print(bp,a);
+                                       BIO_puts(bp,"\n");
+                                       }
+                               }
+#endif
+                       BN_GF2m_add(f, c, e);
+                       /* Test that d^2 = a, where d = sqrt(a). */
+                       if(!BN_is_zero(f))
+                               {
+                               fprintf(stderr,"GF(2^m) modular square root test failed!\n");
+                               goto err;
+                               }
+                       }
+               }
+       ret = 1;
+  err:
+       BN_free(a);
+       BN_free(b[0]);
+       BN_free(b[1]);
+       BN_free(c);
+       BN_free(d);
+       BN_free(e);
+       BN_free(f);
+       return ret;
+       }
+
+int test_gf2m_mod_solve_quad(BIO *bp,BN_CTX *ctx)
+       {
+       BIGNUM *a,*b[2],*c,*d,*e;
+       int i, j, s = 0, t, ret = 0;
+       int p0[] = {163,7,6,3,0,-1};
+       int p1[] = {193,15,0,-1};
+
+       a=BN_new();
+       b[0]=BN_new();
+       b[1]=BN_new();
+       c=BN_new();
+       d=BN_new();
+       e=BN_new();
+
+       BN_GF2m_arr2poly(p0, b[0]);
+       BN_GF2m_arr2poly(p1, b[1]);
+
+       for (i=0; i<num0; i++)
+               {
+               BN_bntest_rand(a, 512, 0, 0);
+               for (j=0; j < 2; j++)
+                       {
+                       t = BN_GF2m_mod_solve_quad(c, a, b[j], ctx);
+                       if (t)
+                               {
+                               s++;
+                               BN_GF2m_mod_sqr(d, c, b[j], ctx);
+                               BN_GF2m_add(d, c, d);
+                               BN_GF2m_mod(e, a, b[j]);
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+                               if (bp != NULL)
+                                       {
+                                       if (!results)
+                                               {
+                                               BN_print(bp,c);
+                                               BIO_puts(bp, " is root of z^2 + z = ");
+                                               BN_print(bp,a);
+                                               BIO_puts(bp, " % ");
+                                               BN_print(bp,b[j]);
+                                               BIO_puts(bp, "\n");
+                                               }
+                                       }
+#endif
+                               BN_GF2m_add(e, e, d);
+                               /* Test that solution of quadratic c satisfies c^2 + c = a. */
+                               if(!BN_is_zero(e))
+                                       {
+                                       fprintf(stderr,"GF(2^m) modular solve quadratic test failed!\n");
+                                       goto err;
+                                       }
+
+                               }
+                       else 
+                               {
+#if 0 /* make test uses ouput in bc but bc can't handle GF(2^m) arithmetic */
+                               if (bp != NULL)
+                                       {
+                                       if (!results)
+                                               {
+                                               BIO_puts(bp, "There are no roots of z^2 + z = ");
+                                               BN_print(bp,a);
+                                               BIO_puts(bp, " % ");
+                                               BN_print(bp,b[j]);
+                                               BIO_puts(bp, "\n");
+                                               }
+                                       }
+#endif
+                               }
+                       }
+               }
+       if (s == 0)
+               {       
+               fprintf(stderr,"All %i tests of GF(2^m) modular solve quadratic resulted in no roots;\n", num0);
+               fprintf(stderr,"this is very unlikely and probably indicates an error.\n");
+               goto err;
+               }
+       ret = 1;
+  err:
+       BN_free(a);
+       BN_free(b[0]);
+       BN_free(b[1]);
+       BN_free(c);
+       BN_free(d);
+       BN_free(e);
+       return ret;
+       }
+#endif
+static int genprime_cb(int p, int n, BN_GENCB *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);
+       return 1;
+       }
+
+int test_kron(BIO *bp, BN_CTX *ctx)
+       {
+       BN_GENCB cb;
+       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;
+
+       BN_GENCB_set(&cb, genprime_cb, NULL);
+       
+       /* 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_ex(b, 512, 0, NULL, NULL, &cb)) 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;
+               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)
+       {
+       BN_GENCB cb;
+       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;
+
+       BN_GENCB_set(&cb, genprime_cb, NULL);
+
+       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_ex(p, 256, 0, a, r, &cb)) 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_small_prime(BIO *bp,BN_CTX *ctx)
+       {
+       static const int bits = 10;
+       int ret = 0;
+       BIGNUM r;
+
+       BN_init(&r);
+       if (!BN_generate_prime_ex(&r, bits, 0, NULL, NULL, NULL))
+               goto err;
+       if (BN_num_bits(&r) != bits)
+               {
+               BIO_printf(bp, "Expected %d bit prime, got %d bit number\n", bits, BN_num_bits(&r));
+               goto err;
+               }
+
+       ret = 1;
+
+err:
+       BN_clear(&r);
+       return ret;
+       }
+#ifndef OPENSSL_SYS_WIN32
+int test_probable_prime_coprime(BIO *bp, BN_CTX *ctx)
+       {
+       int i, j, ret = 0;
+       BIGNUM r;
+       BN_ULONG primes[5] = { 2, 3, 5, 7, 11 };
+
+       BN_init(&r);
+       
+       for (i = 0; i < 1000; i++)
+               {
+               if (!bn_probable_prime_dh_coprime(&r, 1024, ctx)) goto err;
+               
+               for (j = 0; j < 5; j++)
+                       {
+                       if (BN_mod_word(&r, primes[j]) == 0)
+                               {
+                               BIO_printf(bp, "Number generated is not coprime to %ld:\n", primes[j]);
+                               BN_print_fp(stdout, &r);
+                               BIO_printf(bp, "\n");
+                               goto err;
+                               }
+                       }
+               }
+
+       ret = 1;
+
+err:
+       BN_clear(&r);
+       return ret;
+       }
+#endif
 int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_)
        {
        BIGNUM *a,*b,*c,*d;
@@ -839,10 +1974,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 +1997,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 +2026,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 +2046,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 +2070,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 +2092,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 +2113,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 +2131,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);