generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

recognise X9.42 DH certificates on servers

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-04-18 17:03:45 +00:00
parent f897fe4146
commit b583ebb7dd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/p_lib.c
View File

@ -348,7 +348,7 @@ int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey) 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); EVPerr(EVP_F_EVP_PKEY_GET1_DH, EVP_R_EXPECTING_A_DH_KEY);
return NULL; return NULL;
} }

2
ssl/s3_both.c
View File

@ -520,7 +520,7 @@ int ssl_cert_type(X509 *x, EVP_PKEY *pkey)
{ {
ret = SSL_PKEY_GOST01; ret = SSL_PKEY_GOST01;
} }
else if (x && i == EVP_PKEY_DH) else if (x && (i == EVP_PKEY_DH || i == EVP_PKEY_DHX))
{ {
/* For DH two cases: DH certificate signed with RSA and /* For DH two cases: DH certificate signed with RSA and
* DH certificate signed with DSA. * DH certificate signed with DSA.