]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix ECC SSLv2 exclusion on OpenSSL 0.9.8.
authorDr. Stephen Henson <steve@openssl.org>
Mon, 7 Jul 2014 12:00:07 +0000 (13:00 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 7 Jul 2014 12:00:07 +0000 (13:00 +0100)
ssl/s23_lib.c

index 9ec6d14ddcaf20c28aab7f3080d3782f8b6f6358..ad5cee09fa07defc96690df0c8186493042611ee 100644 (file)
@@ -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)
                {