add "randomness"

[openssl.git] / crypto / dh / dhtest.c

diff --git a/crypto/dh/dhtest.c b/crypto/dh/dhtest.c
index 370784b9642cb9193c269363a7ae3e5cd1a7ad2d..1346f98f839c101482e3e2db58e64833fae782ff 100644 (file)
--- a/crypto/dh/dhtest.c
+++ b/crypto/dh/dhtest.c
@@ -81,30 +81,34 @@ int main(int argc, char *argv[])
 #define MS_CALLBACK
 #endif
 
 #define MS_CALLBACK
 #endif
 

-static void MS_CALLBACK cb(int p, int n, char *arg);
+static void MS_CALLBACK cb(int p, int n, void *arg);

 #ifdef NO_STDIO
 #define APPS_WIN16
 #include "bss_file.c"
 #endif
 
 #ifdef NO_STDIO
 #define APPS_WIN16
 #include "bss_file.c"
 #endif
 

-BIO *out=NULL;
+static const char rnd_seed[] = "string to make the random number generator think it has entropy";

 
 int main(int argc, char *argv[])
        {
 
 int main(int argc, char *argv[])
        {

-       DH *a,*b;
+       DH *a;
+       DH *b=NULL;

        char buf[12];
        unsigned char *abuf=NULL,*bbuf=NULL;
        int i,alen,blen,aout,bout,ret=1;
        char buf[12];
        unsigned char *abuf=NULL,*bbuf=NULL;
        int i,alen,blen,aout,bout,ret=1;

+       BIO *out;

 
 #ifdef WIN32
        CRYPTO_malloc_init();
 #endif
 
 
 #ifdef WIN32
        CRYPTO_malloc_init();
 #endif
 

+       RAND_seed(rnd_seed, sizeof rnd_seed);
+

        out=BIO_new(BIO_s_file());
        if (out == NULL) exit(1);
        BIO_set_fp(out,stdout,BIO_NOCLOSE);
 
        out=BIO_new(BIO_s_file());
        if (out == NULL) exit(1);
        BIO_set_fp(out,stdout,BIO_NOCLOSE);
 

-       a=DH_generate_parameters(64,DH_GENERATOR_5,cb,(char *)out);
+       a=DH_generate_parameters(64,DH_GENERATOR_5,cb,out);

        if (a == NULL) goto err;
 
        BIO_puts(out,"\np    =");
        if (a == NULL) goto err;
 
        BIO_puts(out,"\np    =");


@@ -167,11 +171,14 @@ int main(int argc, char *argv[])
 err:
        if (abuf != NULL) Free(abuf);
        if (bbuf != NULL) Free(bbuf);
 err:
        if (abuf != NULL) Free(abuf);
        if (bbuf != NULL) Free(bbuf);

+       if(b != NULL) DH_free(b);
+       if(a != NULL) DH_free(a);
+       BIO_free(out);

        exit(ret);
        return(ret);
        }
 
        exit(ret);
        return(ret);
        }
 

-static void MS_CALLBACK cb(int p, int n, char *arg)
+static void MS_CALLBACK cb(int p, int n, void *arg)

        {
        char c='*';
 
        {
        char c='*';
 


@@ -180,7 +187,7 @@ static void MS_CALLBACK cb(int p, int n, char *arg)
        if (p == 2) c='*';
        if (p == 3) c='\n';
        BIO_write((BIO *)arg,&c,1);
        if (p == 2) c='*';
        if (p == 3) c='\n';
        BIO_write((BIO *)arg,&c,1);

-       BIO_flush((BIO *)arg);
+       (void)BIO_flush((BIO *)arg);

 #ifdef LINT
        p=n;
 #endif
 #ifdef LINT
        p=n;
 #endif