diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-01 15:33:14 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-08 12:30:47 +0100 |
| commit | 3861ac3b558a5f4e0cc0285843baeaaeff3fbe4a (patch) | |
| tree | 37204a28ebd8ee729f150db930a017f000cad5ed /providers/implementations/encode_decode | |
| parent | db554ae1104eb5d3279ca338f58a42be61155f2f (diff) | |
Fix encoding of DHX parameters files
We were getting confused with DHX parameters and encoding them as PKCS3
DH parameters instead.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13050)
Diffstat (limited to 'providers/implementations/encode_decode')
| -rw-r--r-- | providers/implementations/encode_decode/encode_key2any.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/providers/implementations/encode_decode/encode_key2any.c b/providers/implementations/encode_decode/encode_key2any.c index c21b74d9d3..beb487e940 100644 --- a/providers/implementations/encode_decode/encode_key2any.c +++ b/providers/implementations/encode_decode/encode_key2any.c @@ -319,12 +319,23 @@ static int dh_priv_to_der(const void *dh, unsigned char **pder) static int dh_params_to_der_bio(BIO *out, const void *key) { - return i2d_DHparams_bio(out, key); + int type = + DH_test_flags(key, DH_FLAG_TYPE_DHX) ? EVP_PKEY_DHX : EVP_PKEY_DH; + + if (type == EVP_PKEY_DH) + return i2d_DHparams_bio(out, key); + return i2d_DHxparams_bio(out, key); } static int dh_params_to_pem_bio(BIO *out, const void *key) { - return PEM_write_bio_DHparams(out, key); + int type = + DH_test_flags(key, DH_FLAG_TYPE_DHX) ? EVP_PKEY_DHX : EVP_PKEY_DH; + + if (type == EVP_PKEY_DH) + return PEM_write_bio_DHparams(out, key); + + return PEM_write_bio_DHxparams(out, key); } static int dh_check_key_type(const void *key, int expected_type) @@ -940,8 +951,8 @@ static int key2any_encode_params(struct key2any_ctx_st *ctx, #ifndef OPENSSL_NO_DH MAKE_ENCODER(dh, dh, EVP_PKEY_DH, der); MAKE_ENCODER(dh, dh, EVP_PKEY_DH, pem); -MAKE_ENCODER(dhx, dh, EVP_PKEY_DH, der); -MAKE_ENCODER(dhx, dh, EVP_PKEY_DH, pem); +MAKE_ENCODER(dhx, dh, EVP_PKEY_DHX, der); +MAKE_ENCODER(dhx, dh, EVP_PKEY_DHX, pem); #endif #ifndef OPENSSL_NO_DSA MAKE_ENCODER(dsa, dsa, EVP_PKEY_DSA, der); |