projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
It was a very bad idea to use #include "../e_os.h" -- when this occurs
[oweals/openssl.git]
/
apps
/
gendh.c
diff --git
a/apps/gendh.c
b/apps/gendh.c
index 8900b4f1af349c3bd66ac2bae31c2595a3352f75..b3c19581d350370dc6df0a80ece47dec90ab6d08 100644
(file)
--- a/
apps/gendh.c
+++ b/
apps/gendh.c
@@
-56,31
+56,26
@@
* [including the GNU Public Licence.]
*/
* [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 <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
#define DEFBITS 512
#undef PROG
#define PROG gendh_main
-#ifndef NOPROTO
static void MS_CALLBACK dh_cb(int p, int n, char *arg);
static long dh_load_rand(char *names);
static void MS_CALLBACK dh_cb(int p, int n, char *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];
int MAIN(int argc, char **argv)
{
char buffer[200];
@@
-225,5
+220,4
@@
static long dh_load_rand(char *name)
}
return(tot);
}
}
return(tot);
}
-
-
+#endif