PR: 2806

[openssl.git] / ssl / s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 8ba557a919a27530769388b7508d64c44c520eec..0456230fd33ae2bac2a0fe70bf1dbdec9c6730fd 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -1120,7 +1120,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
        1,
        TLS1_TXT_DH_DSS_WITH_AES_128_SHA256,
        TLS1_CK_DH_DSS_WITH_AES_128_SHA256,
        1,
        TLS1_TXT_DH_DSS_WITH_AES_128_SHA256,
        TLS1_CK_DH_DSS_WITH_AES_128_SHA256,

-       SSL_kDHr,
+       SSL_kDHd,

        SSL_aDH,
        SSL_AES128,
        SSL_SHA256,
        SSL_aDH,
        SSL_AES128,
        SSL_SHA256,


@@ -1402,7 +1402,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
        1,
        TLS1_TXT_DH_DSS_WITH_AES_256_SHA256,
        TLS1_CK_DH_DSS_WITH_AES_256_SHA256,
        1,
        TLS1_TXT_DH_DSS_WITH_AES_256_SHA256,
        TLS1_CK_DH_DSS_WITH_AES_256_SHA256,

-       SSL_kDHr,
+       SSL_kDHd,

        SSL_aDH,
        SSL_AES256,
        SSL_SHA256,
        SSL_aDH,
        SSL_AES256,
        SSL_SHA256,


@@ -1953,7 +1953,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
        1,
        TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256,
        TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256,
        1,
        TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256,
        TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256,

-       SSL_kDHr,
+       SSL_kDHd,

        SSL_aDH,
        SSL_AES128GCM,
        SSL_AEAD,
        SSL_aDH,
        SSL_AES128GCM,
        SSL_AEAD,


@@ -1969,7 +1969,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
        1,
        TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384,
        TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384,
        1,
        TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384,
        TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384,

-       SSL_kDHr,
+       SSL_kDHd,

        SSL_aDH,
        SSL_AES256GCM,
        SSL_AEAD,
        SSL_aDH,
        SSL_AES256GCM,
        SSL_AEAD,


@@ -2664,7 +2664,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
        1,
        TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256,
        TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256,
        1,
        TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256,
        TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256,

-       SSL_kECDHe,
+       SSL_kECDHr,

        SSL_aECDH,
        SSL_AES128,
        SSL_SHA256,
        SSL_aECDH,
        SSL_AES128,
        SSL_SHA256,


@@ -2680,7 +2680,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
        1,
        TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384,
        TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384,
        1,
        TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384,
        TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384,

-       SSL_kECDHe,
+       SSL_kECDHr,

        SSL_aECDH,
        SSL_AES256,
        SSL_SHA384,
        SSL_aECDH,
        SSL_AES256,
        SSL_SHA384,


@@ -2794,7 +2794,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
        1,
        TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256,
        TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256,
        1,
        TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256,
        TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256,

-       SSL_kECDHe,
+       SSL_kECDHr,

        SSL_aECDH,
        SSL_AES128GCM,
        SSL_AEAD,
        SSL_aECDH,
        SSL_AES128GCM,
        SSL_AEAD,


@@ -2810,7 +2810,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
        1,
        TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384,
        TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384,
        1,
        TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384,
        TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384,

-       SSL_kECDHe,
+       SSL_kECDHr,

        SSL_aECDH,
        SSL_AES256GCM,
        SSL_AEAD,
        SSL_aECDH,
        SSL_AES256GCM,
        SSL_AEAD,