more mingw related cleanups.

[openssl.git] / crypto / bn / exptest.c

diff --git a/crypto/bn/exptest.c b/crypto/bn/exptest.c
index 4880df1116040bd006c76ca05e8961d4789079c9..b09cf887055037357a79657033941500e2dc1699 100644 (file)
--- a/crypto/bn/exptest.c
+++ b/crypto/bn/exptest.c
@@ -1,5 +1,5 @@
 /* crypto/bn/exptest.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -59,27 +59,37 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "bio.h"
-#include "bn.h"
-#include "rand.h"
-#include "err.h"
+
+#include "../e_os.h"
+
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
 
 #define NUM_BITS       (BN_BITS*2)
 
-int main(argc,argv)
-int argc;
-char *argv[];
+static const char rnd_seed[] = "string to make the random number generator think it has entropy";
+
+int main(int argc, char *argv[])
        {
        BN_CTX *ctx;
        BIO *out=NULL;
        int i,ret;
        unsigned char c;
-       BIGNUM *r_mont,*r_recp,*a,*b,*m;
+       BIGNUM *r_mont,*r_recp,*r_simple,*a,*b,*m;
+
+       RAND_seed(rnd_seed, sizeof rnd_seed); /* or BN_rand may fail, and we don't
+                                              * even check its return value
+                                              * (which we should) */
+
+       ERR_load_BN_strings();
 
        ctx=BN_CTX_new();
-       if (ctx == NULL) exit(1);
+       if (ctx == NULL) EXIT(1);
        r_mont=BN_new();
        r_recp=BN_new();
+       r_simple=BN_new();
        a=BN_new();
        b=BN_new();
        m=BN_new();
@@ -87,12 +97,9 @@ char *argv[];
                (a == NULL) || (b == NULL))
                goto err;
 
-#ifdef WIN16
-       out=BIO_new(BIO_s_file_internal_w16());
-#else
        out=BIO_new(BIO_s_file());
-#endif
-       if (out == NULL) exit(1);
+
+       if (out == NULL) EXIT(1);
        BIO_set_fp(out,stdout,BIO_NOCLOSE);
 
        for (i=0; i<200; i++)
@@ -112,37 +119,69 @@ char *argv[];
                BN_mod(a,a,m,ctx);
                BN_mod(b,b,m,ctx);
 
-               ret=BN_mod_exp_mont(r_mont,a,b,m,ctx);
+               ret=BN_mod_exp_mont(r_mont,a,b,m,ctx,NULL);
                if (ret <= 0)
-                       { printf("BN_mod_exp_mont() problems\n"); exit(1); }
+                       {
+                       printf("BN_mod_exp_mont() problems\n");
+                       ERR_print_errors(out);
+                       EXIT(1);
+                       }
 
                ret=BN_mod_exp_recp(r_recp,a,b,m,ctx);
                if (ret <= 0)
-                       { printf("BN_mod_exp_recp() problems\n"); exit(1); }
-               
-               if (BN_cmp(r_mont,r_recp) != 0)
                        {
-                       printf("\nmont and recp results differ\n");
+                       printf("BN_mod_exp_recp() problems\n");
+                       ERR_print_errors(out);
+                       EXIT(1);
+                       }
+
+               ret=BN_mod_exp_simple(r_simple,a,b,m,ctx);
+               if (ret <= 0)
+                       {
+                       printf("BN_mod_exp_simple() problems\n");
+                       ERR_print_errors(out);
+                       EXIT(1);
+                       }
+
+               if (BN_cmp(r_simple, r_mont) == 0
+                   && BN_cmp(r_simple,r_recp) == 0)
+                       {
+                       printf(".");
+                       fflush(stdout);
+                       }
+               else
+                       {
+                       if (BN_cmp(r_simple,r_mont) != 0)
+                               printf("\nsimple and mont results differ\n");
+                       if (BN_cmp(r_simple,r_recp) != 0)
+                               printf("\nsimple and recp results differ\n");
+
                        printf("a (%3d) = ",BN_num_bits(a));   BN_print(out,a);
                        printf("\nb (%3d) = ",BN_num_bits(b)); BN_print(out,b);
                        printf("\nm (%3d) = ",BN_num_bits(m)); BN_print(out,m);
+                       printf("\nsimple   ="); BN_print(out,r_simple);
                        printf("\nrecp     ="); BN_print(out,r_recp);
                        printf("\nmont     ="); BN_print(out,r_mont);
                        printf("\n");
-                       exit(1);
-                       }
-               else
-                       {
-                       printf(".");
-                       fflush(stdout);
+                       EXIT(1);
                        }
                }
+       BN_free(r_mont);
+       BN_free(r_recp);
+       BN_free(r_simple);
+       BN_free(a);
+       BN_free(b);
+       BN_free(m);
+       BN_CTX_free(ctx);
+       ERR_remove_state(0);
+       CRYPTO_mem_leaks(out);
+       BIO_free(out);
        printf(" done\n");
-       exit(0);
+       EXIT(0);
 err:
        ERR_load_crypto_strings();
        ERR_print_errors(out);
-       exit(1);
+       EXIT(1);
        return(1);
        }