correct macro.
[openssl.git] / crypto / bn / bntest.c
index ec48bad73835169ad0b77e4bcc8bdf08feb9bb68..503c4f390135f8143b126d8fd9f723255271b4c9 100644 (file)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "e_os.h"
-#include "bio.h"
-#include "bn.h"
-#include "rand.h"
-#include "x509.h"
-#include "err.h"
+
+#include "openssl/e_os.h"
+
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/rand.h>
+#include <openssl/x509.h>
+#include <openssl/err.h>
 
 #ifdef WINDOWS
 #include "../bio/bss_file.c"
 #endif
 
-#ifndef NOPROTO
+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);
-int test_lshift(BIO *bp);
+int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_);
 int test_rshift1(BIO *bp);
-int test_rshift(BIO *bp);
+int test_rshift(BIO *bp,BN_CTX *ctx);
 int test_div(BIO *bp,BN_CTX *ctx);
 int test_div_recp(BIO *bp,BN_CTX *ctx);
 int test_mul(BIO *bp);
@@ -85,24 +90,8 @@ 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_exp(BIO *bp,BN_CTX *ctx);
 int rand_neg(void);
-#else
-int test_add ();
-int test_sub ();
-int test_lshift1 ();
-int test_lshift ();
-int test_rshift1 ();
-int test_rshift ();
-int test_div ();
-int test_mul ();
-int test_sqr ();
-int test_mont ();
-int test_mod ();
-int test_mod_mul ();
-int test_mod_exp ();
-int rand_neg();
-#endif
-
 static int results=0;
 
 #ifdef NO_STDIO
@@ -110,15 +99,32 @@ static int results=0;
 #include "bss_file.c"
 #endif
 
-int main(argc,argv)
-int argc;
-char *argv[];
+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);
+#if defined(linux) || defined(__FreeBSD__) /* can we use GNU bc features? */
+       BIO_puts(out, "print \"test ");
+       BIO_puts(out, m);
+       BIO_puts(out, "\\n\"\n");
+#endif
+       }
+
+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_rand may fail, and we don't
+                                              * even check its return value
+                                              * (which we should) */
 
        argc--;
        argv++;
@@ -157,74 +163,85 @@ 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);
 
-       fprintf(stderr,"test BN_sub\n");
+       message(out,"BN_sub");
        if (!test_sub(out)) goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_lshift1\n");
+       message(out,"BN_lshift1");
        if (!test_lshift1(out)) goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_lshift\n");
-       if (!test_lshift(out)) goto err;
+       message(out,"BN_lshift (fixed)");
+       if (!test_lshift(out,ctx,BN_bin2bn(lst,sizeof(lst)-1,NULL)))
+           goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_rshift1\n");
+       message(out,"BN_lshift");
+       if (!test_lshift(out,ctx,NULL)) goto err;
+       fflush(stdout);
+
+       message(out,"BN_rshift1");
        if (!test_rshift1(out)) goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_rshift\n");
-       if (!test_rshift(out)) goto err;
+       message(out,"BN_rshift");
+       if (!test_rshift(out,ctx)) goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_sqr\n");
+       message(out,"BN_sqr");
        if (!test_sqr(out,ctx)) goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_mul\n");
+       message(out,"BN_mul");
        if (!test_mul(out)) goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_div\n");
+       message(out,"BN_div");
        if (!test_div(out,ctx)) goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_div_recp\n");
+       message(out,"BN_div_recp");
        if (!test_div_recp(out,ctx)) goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_mod\n");
+       message(out,"BN_mod");
        if (!test_mod(out,ctx)) goto err;
        fflush(stdout);
 
-       fprintf(stderr,"test BN_mod_mul\n");
+       message(out,"BN_mod_mul");
        if (!test_mod_mul(out,ctx)) goto err;
        fflush(stdout);
 
-/*
-       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");
+
+       message(out,"BN_mod_exp");
        if (!test_mod_exp(out,ctx)) goto err;
        fflush(stdout);
 
+       message(out,"BN_exp");
+       if (!test_exp(out,ctx)) goto err;
+       fflush(stdout);
+
+       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 */
        ERR_load_crypto_strings();
-       ERR_print_errors(out);
+       ERR_print_errors_fp(stderr);
        exit(1);
        return(1);
        }
 
-int test_add(bp)
-BIO *bp;
+int test_add(BIO *bp)
        {
        BIGNUM a,b,c;
        int i;
@@ -235,7 +252,7 @@ BIO *bp;
        BN_init(&c);
 
        BN_rand(&a,512,0,0);
-       for (i=0; i<100; i++)
+       for (i=0; i<num0; i++)
                {
                BN_rand(&b,450+i,0,0);
                a.neg=rand_neg();
@@ -256,6 +273,15 @@ BIO *bp;
                        BN_print(bp,&c);
                        BIO_puts(bp,"\n");
                        }
+               a.neg=!a.neg;
+               b.neg=!b.neg;
+               BN_add(&c,&c,&b);
+               BN_add(&c,&c,&a);
+               if(!BN_is_zero(&c))
+                   {
+                   fprintf(stderr,"Add test failed!\n");
+                   return 0;
+                   }
                }
        BN_free(&a);
        BN_free(&b);
@@ -263,8 +289,7 @@ BIO *bp;
        return(1);
        }
 
-int test_sub(bp)
-BIO *bp;
+int test_sub(BIO *bp)
        {
        BIGNUM a,b,c;
        int i;
@@ -274,12 +299,21 @@ BIO *bp;
        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 (i < num1)
+                       {
+                       BN_rand(&a,512,0,0);
+                       BN_copy(&b,&a);
+                       if (BN_set_bit(&a,i)==0) return(0);
+                       BN_add_word(&b,i);
+                       }
+               else
+                       {
+                       BN_rand(&b,400+i-num1,0,0);
+                       a.neg=rand_neg();
+                       b.neg=rand_neg();
+                       }
                if (bp == NULL)
                        for (j=0; j<10000; j++)
                                BN_sub(&c,&a,&b);
@@ -296,6 +330,13 @@ BIO *bp;
                        BN_print(bp,&c);
                        BIO_puts(bp,"\n");
                        }
+               BN_add(&c,&c,&b);
+               BN_sub(&c,&c,&a);
+               if(!BN_is_zero(&c))
+                   {
+                   fprintf(stderr,"Subtract test failed!\n");
+                   return 0;
+                   }
                }
        BN_free(&a);
        BN_free(&b);
@@ -303,11 +344,9 @@ BIO *bp;
        return(1);
        }
 
-int test_div(bp,ctx)
-BIO *bp;
-BN_CTX *ctx;
+int test_div(BIO *bp, BN_CTX *ctx)
        {
-       BIGNUM a,b,c,d;
+       BIGNUM a,b,c,d,e;
        int i;
        int j;
 
@@ -315,11 +354,19 @@ BN_CTX *ctx;
        BN_init(&b);
        BN_init(&c);
        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_rand(&a,400,0,0);
+                       BN_copy(&b,&a);
+                       BN_lshift(&a,&a,i);
+                       BN_add_word(&a,i);
+                       }
+               else
+                       BN_rand(&b,50+3*(i-num1),0,0);
                a.neg=rand_neg();
                b.neg=rand_neg();
                if (bp == NULL)
@@ -348,19 +395,26 @@ BN_CTX *ctx;
                        BN_print(bp,&c);
                        BIO_puts(bp,"\n");
                        }
+               BN_mul(&e,&d,&b,ctx);
+               BN_add(&d,&e,&c);
+               BN_sub(&d,&d,&a);
+               if(!BN_is_zero(&d))
+                   {
+                   fprintf(stderr,"Division test failed!\n");
+                   return 0;
+                   }
                }
        BN_free(&a);
        BN_free(&b);
        BN_free(&c);
        BN_free(&d);
+       BN_free(&e);
        return(1);
        }
 
-int test_div_recp(bp,ctx)
-BIO *bp;
-BN_CTX *ctx;
+int test_div_recp(BIO *bp, BN_CTX *ctx)
        {
-       BIGNUM a,b,c,d;
+       BIGNUM a,b,c,d,e;
        BN_RECP_CTX recp;
        int i;
        int j;
@@ -370,11 +424,19 @@ BN_CTX *ctx;
        BN_init(&b);
        BN_init(&c);
        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_rand(&a,400,0,0);
+                       BN_copy(&b,&a);
+                       BN_lshift(&a,&a,i);
+                       BN_add_word(&a,i);
+                       }
+               else
+                       BN_rand(&b,50+3*(i-num1),0,0);
                a.neg=rand_neg();
                b.neg=rand_neg();
                BN_RECP_CTX_set(&recp,&b,ctx);
@@ -404,19 +466,32 @@ BN_CTX *ctx;
                        BN_print(bp,&c);
                        BIO_puts(bp,"\n");
                        }
+               BN_mul(&e,&d,&b,ctx);
+               BN_add(&d,&e,&c);
+               BN_sub(&d,&d,&a);
+               if(!BN_is_zero(&d))
+                   {
+                   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;
+                   }
                }
        BN_free(&a);
        BN_free(&b);
        BN_free(&c);
        BN_free(&d);
+       BN_free(&e);
        BN_RECP_CTX_free(&recp);
        return(1);
        }
 
-int test_mul(bp)
-BIO *bp;
+int test_mul(BIO *bp)
        {
-       BIGNUM a,b,c;
+       BIGNUM a,b,c,d,e;
        int i;
        int j;
        BN_CTX ctx;
@@ -425,19 +500,24 @@ BIO *bp;
        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_rand(&a,100,0,0);
+                       BN_rand(&b,100,0,0);
+                       }
+               else
+                       BN_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_do(&c,&a,&b,ctx); */
                if (bp != NULL)
                        {
                        if (!results)
@@ -450,26 +530,35 @@ BIO *bp;
                        BN_print(bp,&c);
                        BIO_puts(bp,"\n");
                        }
+               BN_div(&d,&e,&c,&a,&ctx);
+               BN_sub(&d,&d,&b);
+               if(!BN_is_zero(&d) || !BN_is_zero(&e))
+                   {
+                   fprintf(stderr,"Multiplication test failed!\n");
+                   return 0;
+                   }
                }
        BN_free(&a);
        BN_free(&b);
        BN_free(&c);
+       BN_free(&d);
+       BN_free(&e);
        BN_CTX_free(&ctx);
        return(1);
        }
 
-int test_sqr(bp,ctx)
-BIO *bp;
-BN_CTX *ctx;
+int test_sqr(BIO *bp, BN_CTX *ctx)
        {
-       BIGNUM a,c;
+       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);
                a.neg=rand_neg();
@@ -489,17 +578,24 @@ BN_CTX *ctx;
                        BN_print(bp,&c);
                        BIO_puts(bp,"\n");
                        }
+               BN_div(&d,&e,&c,&a,ctx);
+               BN_sub(&d,&d,&a);
+               if(!BN_is_zero(&d) || !BN_is_zero(&e))
+                   {
+                   fprintf(stderr,"Square test failed!\n");
+                   return 0;
+                   }
                }
        BN_free(&a);
        BN_free(&c);
+       BN_free(&d);
+       BN_free(&e);
        return(1);
        }
 
-int test_mont(bp,ctx)
-BIO *bp;
-BN_CTX *ctx;
+int test_mont(BIO *bp, BN_CTX *ctx)
        {
-       BIGNUM a,b,c,A,B;
+       BIGNUM a,b,c,d,A,B;
        BIGNUM n;
        int i;
        int j;
@@ -508,6 +604,7 @@ BN_CTX *ctx;
        BN_init(&a);
        BN_init(&b);
        BN_init(&c);
+       BN_init(&d);
        BN_init(&A);
        BN_init(&B);
        BN_init(&n);
@@ -516,9 +613,13 @@ BN_CTX *ctx;
 
        BN_rand(&a,100,0,0); /**/
        BN_rand(&b,100,0,0); /**/
-       for (i=0; i<10; i++)
+       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_rand(&n,bits,0,1);
                BN_MONT_CTX_set(mont,&n,ctx);
 
                BN_to_montgomery(&A,&a,mont,ctx);
@@ -549,28 +650,39 @@ BN_num_bits(mont->N));
                        BN_print(bp,&A);
                        BIO_puts(bp,"\n");
                        }
+               BN_mod_mul(&d,&a,&b,&n,ctx);
+               BN_sub(&d,&d,&A);
+               if(!BN_is_zero(&d))
+                   {
+                   fprintf(stderr,"Montgomery multiplication test failed!\n");
+                   return 0;
+                   }
                }
        BN_MONT_CTX_free(mont);
        BN_free(&a);
        BN_free(&b);
        BN_free(&c);
+       BN_free(&d);
+       BN_free(&A);
+       BN_free(&B);
+       BN_free(&n);
        return(1);
        }
 
-int test_mod(bp,ctx)
-BIO *bp;
-BN_CTX *ctx;
+int test_mod(BIO *bp, BN_CTX *ctx)
        {
-       BIGNUM *a,*b,*c;
+       BIGNUM *a,*b,*c,*d,*e;
        int i;
        int j;
 
        a=BN_new();
        b=BN_new();
        c=BN_new();
+       d=BN_new();
+       e=BN_new();
 
        BN_rand(a,1024,0,0); /**/
-       for (i=0; i<20; i++)
+       for (i=0; i<num0; i++)
                {
                BN_rand(b,450+i*10,0,0); /**/
                a->neg=rand_neg();
@@ -591,16 +703,23 @@ BN_CTX *ctx;
                        BN_print(bp,c);
                        BIO_puts(bp,"\n");
                        }
+               BN_div(d,e,a,b,ctx);
+               BN_sub(e,e,c);
+               if(!BN_is_zero(e))
+                   {
+                   fprintf(stderr,"Modulo 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_mul(bp,ctx)
-BIO *bp;
-BN_CTX *ctx;
+int test_mod_mul(BIO *bp, BN_CTX *ctx)
        {
        BIGNUM *a,*b,*c,*d,*e;
        int i;
@@ -612,10 +731,10 @@ BN_CTX *ctx;
        e=BN_new();
 
        BN_rand(c,1024,0,0); /**/
-       for (i=0; i<10; i++)
+       for (i=0; i<num0; i++)
                {
                BN_rand(a,475+i*10,0,0); /**/
-               BN_rand(b,425+i*10,0,0); /**/
+               BN_rand(b,425+i*11,0,0); /**/
                a->neg=rand_neg();
                b->neg=rand_neg();
        /*      if (bp == NULL)
@@ -645,6 +764,14 @@ BN_CTX *ctx;
                        BN_print(bp,e);
                        BIO_puts(bp,"\n");
                        }
+               BN_mul(d,a,b,ctx);
+               BN_sub(d,d,e);
+               BN_div(a,b,d,c,ctx);
+               if(!BN_is_zero(b))
+                   {
+                   fprintf(stderr,"Modulo multiply test failed!\n");
+                   return 0;
+                   }
                }
        BN_free(a);
        BN_free(b);
@@ -654,9 +781,7 @@ BN_CTX *ctx;
        return(1);
        }
 
-int test_mod_exp(bp,ctx)
-BIO *bp;
-BN_CTX *ctx;
+int test_mod_exp(BIO *bp, BN_CTX *ctx)
        {
        BIGNUM *a,*b,*c,*d,*e;
        int i;
@@ -668,7 +793,7 @@ BN_CTX *ctx;
        e=BN_new();
 
        BN_rand(c,30,0,1); /* must be odd for montgomery */
-       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); /**/
@@ -690,6 +815,14 @@ BN_CTX *ctx;
                        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);
@@ -699,20 +832,75 @@ BN_CTX *ctx;
        return(1);
        }
 
-int test_lshift(bp)
-BIO *bp;
+int test_exp(BIO *bp, BN_CTX *ctx)
        {
-       BIGNUM *a,*b,*c;
+       BIGNUM *a,*b,*d,*e,*one;
        int i;
 
        a=BN_new();
+       b=BN_new();
+       d=BN_new();
+       e=BN_new();
+       one=BN_new();
+       BN_one(one);
+
+       for (i=0; i<num2; i++)
+               {
+               BN_rand(a,20+i*5,0,0); /**/
+               BN_rand(b,2+i,0,0); /**/
+
+               if (!BN_exp(d,a,b,ctx))
+                       return(00);
+
+               if (bp != NULL)
+                       {
+                       if (!results)
+                               {
+                               BN_print(bp,a);
+                               BIO_puts(bp," ^ ");
+                               BN_print(bp,b);
+                               BIO_puts(bp," - ");
+                               }
+                       BN_print(bp,d);
+                       BIO_puts(bp,"\n");
+                       }
+               BN_one(e);
+               for( ; !BN_is_zero(b) ; BN_sub(b,b,one))
+                   BN_mul(e,e,a,ctx);
+               BN_sub(e,e,d);
+               if(!BN_is_zero(e))
+                   {
+                   fprintf(stderr,"Exponentiation test failed!\n");
+                   return 0;
+                   }
+               }
+       BN_free(a);
+       BN_free(b);
+       BN_free(d);
+       BN_free(e);
+       BN_free(one);
+       return(1);
+       }
+
+int test_lshift(BIO *bp,BN_CTX *ctx,BIGNUM *a_)
+       {
+       BIGNUM *a,*b,*c,*d;
+       int i;
+
        b=BN_new();
        c=BN_new();
+       d=BN_new();
        BN_one(c);
 
-       BN_rand(a,200,0,0); /**/
-       a->neg=rand_neg();
-       for (i=0; i<70; i++)
+       if(a_)
+           a=a_;
+       else
+           {
+           a=BN_new();
+           BN_rand(a,200,0,0); /**/
+           a->neg=rand_neg();
+           }
+       for (i=0; i<num0; i++)
                {
                BN_lshift(b,a,i+1);
                BN_add(c,c,c);
@@ -728,25 +916,42 @@ BIO *bp;
                        BN_print(bp,b);
                        BIO_puts(bp,"\n");
                        }
+               BN_mul(d,a,c,ctx);
+               BN_sub(d,d,b);
+               if(!BN_is_zero(d))
+                   {
+                   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;
+                   }
                }
        BN_free(a);
        BN_free(b);
        BN_free(c);
+       BN_free(d);
        return(1);
        }
 
-int test_lshift1(bp)
-BIO *bp;
+int test_lshift1(BIO *bp)
        {
-       BIGNUM *a,*b;
+       BIGNUM *a,*b,*c;
        int i;
 
        a=BN_new();
        b=BN_new();
+       c=BN_new();
 
        BN_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)
@@ -760,27 +965,37 @@ BIO *bp;
                        BN_print(bp,b);
                        BIO_puts(bp,"\n");
                        }
+               BN_add(c,a,a);
+               BN_sub(a,b,c);
+               if(!BN_is_zero(a))
+                   {
+                   fprintf(stderr,"Left shift one test failed!\n");
+                   return 0;
+                   }
+               
                BN_copy(a,b);
                }
        BN_free(a);
        BN_free(b);
+       BN_free(c);
        return(1);
        }
 
-int test_rshift(bp)
-BIO *bp;
+int test_rshift(BIO *bp,BN_CTX *ctx)
        {
-       BIGNUM *a,*b,*c;
+       BIGNUM *a,*b,*c,*d,*e;
        int i;
 
        a=BN_new();
        b=BN_new();
        c=BN_new();
+       d=BN_new();
+       e=BN_new();
        BN_one(c);
 
        BN_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);
@@ -796,25 +1011,34 @@ BIO *bp;
                        BN_print(bp,b);
                        BIO_puts(bp,"\n");
                        }
+               BN_div(d,e,a,c,ctx);
+               BN_sub(d,d,b);
+               if(!BN_is_zero(d))
+                   {
+                   fprintf(stderr,"Right shift test failed!\n");
+                   return 0;
+                   }
                }
        BN_free(a);
        BN_free(b);
        BN_free(c);
+       BN_free(d);
+       BN_free(e);
        return(1);
        }
 
-int test_rshift1(bp)
-BIO *bp;
+int test_rshift1(BIO *bp)
        {
-       BIGNUM *a,*b;
+       BIGNUM *a,*b,*c;
        int i;
 
        a=BN_new();
        b=BN_new();
+       c=BN_new();
 
        BN_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)
@@ -828,14 +1052,22 @@ BIO *bp;
                        BN_print(bp,b);
                        BIO_puts(bp,"\n");
                        }
+               BN_sub(c,a,b);
+               BN_sub(c,c,b);
+               if(!BN_is_zero(c) && !BN_is_one(c))
+                   {
+                   fprintf(stderr,"Right shift one test failed!\n");
+                   return 0;
+                   }
                BN_copy(a,b);
                }
        BN_free(a);
        BN_free(b);
+       BN_free(c);
        return(1);
        }
 
-int rand_neg()
+int rand_neg(void)
        {
        static unsigned int neg=0;
        static int sign[8]={0,0,0,1,1,0,1,1};