Commit b2141841 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

recognise X9.42 DH certificates on servers

parent aa09c2c6

crypto/evp/p_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

ssl/s3_both.c

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ int ssl_cert_type(X509 *x, EVP_PKEY *pkey) 
		{

		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

		 * DH certificate signed with DSA.