projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for CMS/PKCS7 MMA. If RSA decryption fails use a random key and
[oweals/openssl.git]
/
apps
/
dhparam.c
diff --git
a/apps/dhparam.c
b/apps/dhparam.c
index e3cabcfcdccd4e4598380c476bad58bb3a35bfaa..465cdfe77bfac05d4bbd0890d88b30d3522686d6 100644
(file)
--- a/
apps/dhparam.c
+++ b/
apps/dhparam.c
@@
-109,6
+109,7
@@
*
*/
*
*/
+#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
#ifndef OPENSSL_NO_DH
#include <stdio.h>
#include <stdlib.h>
#ifndef OPENSSL_NO_DH
#include <stdio.h>
#include <stdlib.h>
@@
-148,9
+149,6
@@
int MAIN(int, char **);
int MAIN(int argc, char **argv)
{
int MAIN(int argc, char **argv)
{
-#ifndef OPENSSL_NO_ENGINE
- ENGINE *e = NULL;
-#endif
DH *dh=NULL;
int i,badops=0,text=0;
#ifndef OPENSSL_NO_DSA
DH *dh=NULL;
int i,badops=0,text=0;
#ifndef OPENSSL_NO_DSA
@@
-269,7
+267,7
@@
bad:
ERR_load_crypto_strings();
#ifndef OPENSSL_NO_ENGINE
ERR_load_crypto_strings();
#ifndef OPENSSL_NO_ENGINE
-
e =
setup_engine(bio_err, engine, 0);
+ setup_engine(bio_err, engine, 0);
#endif
if (g && !num)
#endif
if (g && !num)