1 files changed, 8 insertions, 10 deletions

diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c
index 04c7046a7b..b7bcd2c7a4 100644
--- a/src/lib/libcrypto/dh/dh_gen.c
+++ b/src/lib/libcrypto/dh/dh_gen.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "dh.h"
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
 /* We generate DH parameters as follows
  * find a prime q which is prime_len/2 bits long.
@@ -83,11 +83,8 @@
  * this generator function can take a very very long time to run.
  */
 
-DH *DH_generate_parameters(prime_len,generator,callback,cb_arg)
-int prime_len;
-int generator;
-void (*callback)(P_I_I_P);
-char *cb_arg;
+DH *DH_generate_parameters(int prime_len, int generator,
+             void (*callback)(int,int,void *), void *cb_arg)
         {
         BIGNUM *p=NULL,*t1,*t2;
         DH *ret=NULL;
@@ -95,10 +92,11 @@ char *cb_arg;
         BN_CTX *ctx=NULL;
 
         ret=DH_new();
+        if (ret == NULL) goto err;
         ctx=BN_CTX_new();
         if (ctx == NULL) goto err;
-        t1=ctx->bn[0];
-        t2=ctx->bn[1];
+        t1= &(ctx->bn[0]);
+        t2= &(ctx->bn[1]);
         ctx->tos=2;
         
         if (generator == DH_GENERATOR_2)
@@ -126,7 +124,7 @@ char *cb_arg;
         else
                 g=generator;
         
-        p=BN_generate_prime(prime_len,1,t1,t2,callback,cb_arg);
+        p=BN_generate_prime(NULL,prime_len,1,t1,t2,callback,cb_arg);
         if (p == NULL) goto err;
         if (callback != NULL) callback(3,0,cb_arg);
         ret->p=p;