diff options
author | Matt Caswell <matt@openssl.org> | 2015-05-22 13:33:19 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-05-22 23:58:52 +0100 |
commit | 13f8eb4730b9fc039e743870f81e5ff54b3d05b8 (patch) | |
tree | a8a7082838db0e12b06174f6b85cb94fda5ab647 /ssl/s3_lib.c | |
parent | efee575ad464bfb60bf72dcb73f9b51768f4b1a1 (diff) | |
download | openssl-13f8eb4730b9fc039e743870f81e5ff54b3d05b8.zip openssl-13f8eb4730b9fc039e743870f81e5ff54b3d05b8.tar.gz openssl-13f8eb4730b9fc039e743870f81e5ff54b3d05b8.tar.bz2 |
Remove export static DH ciphersuites
Remove support for the two export grade static DH ciphersuites. These two
ciphersuites were newly added (along with a number of other static DH
ciphersuites) to 1.0.2. However the two export ones have *never* worked
since they were introduced. It seems strange in any case to be adding new
export ciphersuites, and given "logjam" it also does not seem correct to
fix them.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r-- | ssl/s3_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 3aa9863..efd9683 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -330,7 +330,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = { /* The DH ciphers */ /* Cipher 0B */ { - 1, + 0, SSL3_TXT_DH_DSS_DES_40_CBC_SHA, SSL3_CK_DH_DSS_DES_40_CBC_SHA, SSL_kDHd, @@ -378,7 +378,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = { /* Cipher 0E */ { - 1, + 0, SSL3_TXT_DH_RSA_DES_40_CBC_SHA, SSL3_CK_DH_RSA_DES_40_CBC_SHA, SSL_kDHr, |