diff options
| author | Matt Caswell <matt@openssl.org> | 2017-04-03 12:42:58 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-04-03 20:04:06 +0100 |
| commit | 18d20b5eb66fda0ada2e65c2b19aeae75827bdf8 (patch) | |
| tree | 4ad6e1a47a400f7664b6c8508d3f340f1fea0780 | |
| parent | ff79a24402108ba2cc313f52c745b69d473eb4b1 (diff) | |
Ensure dhparams can handle X9.42 params in DER
dhparams correctly handles X9.42 params in PEM format. However it failed
to correctly processes them when reading/writing DER format.
Fixes #3102
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3111)
| -rw-r--r-- | apps/dhparam.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/apps/dhparam.c b/apps/dhparam.c index 5fca25e17a..6cd059fd16 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -242,10 +242,19 @@ int dhparam_main(int argc, char **argv) } else # endif { - if (informat == FORMAT_ASN1) + if (informat == FORMAT_ASN1) { + /* + * We have no PEM header to determine what type of DH params it + * is. We'll just try both. + */ dh = d2i_DHparams_bio(in, NULL); - else /* informat == FORMAT_PEM */ + /* BIO_reset() returns 0 for success for file BIOs only!!! */ + if (dh == NULL && BIO_reset(in) == 0) + dh = d2i_DHxparams_bio(in, NULL); + } else { + /* informat == FORMAT_PEM */ dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL); + } if (dh == NULL) { BIO_printf(bio_err, "unable to load DH parameters\n"); @@ -340,9 +349,12 @@ int dhparam_main(int argc, char **argv) if (!noout) { const BIGNUM *q; DH_get0_pqg(dh, NULL, &q, NULL); - if (outformat == FORMAT_ASN1) - i = i2d_DHparams_bio(out, dh); - else if (q != NULL) + if (outformat == FORMAT_ASN1) { + if (q != NULL) + i = i2d_DHxparams_bio(out, dh); + else + i = i2d_DHparams_bio(out, dh); + } else if (q != NULL) i = PEM_write_bio_DHxparams(out, dh); else i = PEM_write_bio_DHparams(out, dh); |