Ensure EVP_PKEY_set1_DH detects X9.42 keys
authorMatt Caswell <matt@openssl.org>
Mon, 9 Dec 2019 11:51:48 +0000 (11:51 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 16 Dec 2019 14:34:26 +0000 (14:34 +0000)
commite6d06e11e9cea84e41b0b68f63dacb4d4db356cc
tree7ac1161781b15b827aebb099ad9a3beda1ae8548
parent39d9123891845f203465dfda181f5c24b45756d1
Ensure EVP_PKEY_set1_DH detects X9.42 keys

OpenSSL supports both PKCS#3 and X9.42 DH keys. By default we use PKCS#3
keys. The function `EVP_PKEY_set1_DH` was assuming that the supplied DH
key was a PKCS#3 key. It should detect what type of key it is and assign
the correct type as appropriate.

Fixes #10592

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10593)

(cherry picked from commit 32c869ffaba67822602ea9fec611272ff8e8db58)
crypto/evp/p_lib.c