"linux-sparc64-gcc" configuration

[openssl.git] / apps / gendh.c

diff --git a/apps/gendh.c b/apps/gendh.c
index 8900b4f1af349c3bd66ac2bae31c2595a3352f75..e5cb646bfb039e733263ea0dfc997e488a085994 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -56,31 +56,26 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DH
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "dh.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS        512
 #undef PROG
 #define PROG gendh_main
 
-#ifndef NOPROTO
-static void MS_CALLBACK dh_cb(int p, int n, char *arg);
+static void MS_CALLBACK dh_cb(int p, int n, void *arg);
 static long dh_load_rand(char *names);
-#else
-static void MS_CALLBACK dh_cb();
-static long dh_load_rand();
-#endif
-
 int MAIN(int argc, char **argv)
        {
        char buffer[200];
@@ -169,7 +164,7 @@ bad:
 
        BIO_printf(bio_err,"Generating DH parameters, %d bit long strong prime, generator of %d\n",num,g);
        BIO_printf(bio_err,"This is going to take a long time\n");
-       dh=DH_generate_parameters(num,g,dh_cb,(char *)bio_err);
+       dh=DH_generate_parameters(num,g,dh_cb,bio_err);
                
        if (dh == NULL) goto end;
 
@@ -189,7 +184,7 @@ end:
        EXIT(ret);
        }
 
-static void MS_CALLBACK dh_cb(int p, int n, char *arg)
+static void MS_CALLBACK dh_cb(int p, int n, void *arg)
        {
        char c='*';
 
@@ -225,5 +220,4 @@ static long dh_load_rand(char *name)
                }
        return(tot);
        }
-
-
+#endif