From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 7 Jul 2014 12:00:07 +0000 (+0100)
Subject: Fix ECC SSLv2 exclusion on OpenSSL 0.9.8.
X-Git-Tag: OpenSSL_0_9_8zb~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a0fdc4c6d657538b6a2c0b84e8bf06ab676854c4;p=oweals%2Fopenssl.git

Fix ECC SSLv2 exclusion on OpenSSL 0.9.8.
---

diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c
index 9ec6d14ddc..ad5cee09fa 100644
--- a/ssl/s23_lib.c
+++ b/ssl/s23_lib.c
@@ -113,11 +113,7 @@ int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
 
 	/* We can write SSLv2 and SSLv3 ciphers */
 	/* but no ECC ciphers */
-	if (c->algorithm_mkey == SSL_kECDHr ||
-		c->algorithm_mkey == SSL_kECDHe ||
-		c->algorithm_mkey == SSL_kEECDH ||
-		c->algorithm_auth == SSL_aECDH ||
-		c->algorithm_auth == SSL_aECDSA)
+	if (c->algorithms & (SSL_ECDH|SSL_aECDSA))
 		return 0;
 	if (p != NULL)
 		{