summaryrefslogtreecommitdiffstats
path: root/crypto/evp/p_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-04-18 17:03:29 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-04-18 17:03:29 +0000
commitb2141841601645dfb19fe6f768b6394d9551d08c (patch)
treefec16e1e72fb324dd55cba7f90b49a23137ec1b6 /crypto/evp/p_lib.c
parentaa09c2c631f9e667f697370d9c24660f56a629f9 (diff)
recognise X9.42 DH certificates on servers
Diffstat (limited to 'crypto/evp/p_lib.c')
-rw-r--r--crypto/evp/p_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index e26ccd0d08..109188c45b 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -348,7 +348,7 @@ int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey)
{
- if(pkey->type != EVP_PKEY_DH) {
+ if(pkey->type != EVP_PKEY_DH && pkey->type != EVP_PKEY_DHX) {
EVPerr(EVP_F_EVP_PKEY_GET1_DH, EVP_R_EXPECTING_A_DH_KEY);
return NULL;
}