projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set Enveloped data version to 2 if ktri version not zero.
[oweals/openssl.git]
/
apps
/
dhparam.c
diff --git
a/apps/dhparam.c
b/apps/dhparam.c
index e3cabcfcdccd4e4598380c476bad58bb3a35bfaa..f5d7126af7a5d16bedbcb9dc9713f9212e56c189 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)
@@
-334,7
+332,6
@@
bad:
BIO_printf(bio_err,"This is going to take a long time\n");
if(!dh || !DH_generate_parameters_ex(dh, num, g, &cb))
{
BIO_printf(bio_err,"This is going to take a long time\n");
if(!dh || !DH_generate_parameters_ex(dh, num, g, &cb))
{
- if(dh) DH_free(dh);
ERR_print_errors(bio_err);
goto end;
}
ERR_print_errors(bio_err);
goto end;
}
@@
-515,7
+512,12
@@
bad:
if (outformat == FORMAT_ASN1)
i=i2d_DHparams_bio(out,dh);
else if (outformat == FORMAT_PEM)
if (outformat == FORMAT_ASN1)
i=i2d_DHparams_bio(out,dh);
else if (outformat == FORMAT_PEM)
- i=PEM_write_bio_DHparams(out,dh);
+ {
+ if (dh->q)
+ i=PEM_write_bio_DHxparams(out,dh);
+ else
+ i=PEM_write_bio_DHparams(out,dh);
+ }
else {
BIO_printf(bio_err,"bad output format specified for outfile\n");
goto end;
else {
BIO_printf(bio_err,"bad output format specified for outfile\n");
goto end;
@@
-553,4
+555,10
@@
static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
return 1;
}
return 1;
}
+#else /* !OPENSSL_NO_DH */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
#endif
#endif