From 1576d117fd48c972306b2973f975d424551988e9 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sat, 12 Jul 2014 22:33:39 +0000 Subject: The correct name for EDH is DHE, likewise EECDH should be ECDHE. Based on changes to OpenSSL trunk. ok beck@ miod@ --- src/lib/libssl/s3_lib.c | 134 ++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'src/lib/libssl/s3_lib.c') diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index f94e207fc4..decdda90a3 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.69 2014/07/11 09:24:44 beck Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.70 2014/07/12 22:33:39 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -433,7 +433,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 0, /* Weakened 40-bit export cipher. */ .name = SSL3_TXT_EDH_DSS_DES_40_CBC_SHA, .id = SSL3_CK_EDH_DSS_DES_40_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_DES, .algorithm_mac = SSL_SHA1, @@ -449,7 +449,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = SSL3_TXT_EDH_DSS_DES_64_CBC_SHA, .id = SSL3_CK_EDH_DSS_DES_64_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_DES, .algorithm_mac = SSL_SHA1, @@ -465,7 +465,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA, .id = SSL3_CK_EDH_DSS_DES_192_CBC3_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, @@ -481,7 +481,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 0, /* Weakened 40-bit export cipher. */ .name = SSL3_TXT_EDH_RSA_DES_40_CBC_SHA, .id = SSL3_CK_EDH_RSA_DES_40_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_DES, .algorithm_mac = SSL_SHA1, @@ -497,7 +497,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = SSL3_TXT_EDH_RSA_DES_64_CBC_SHA, .id = SSL3_CK_EDH_RSA_DES_64_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_DES, .algorithm_mac = SSL_SHA1, @@ -513,7 +513,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA, .id = SSL3_CK_EDH_RSA_DES_192_CBC3_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, @@ -529,7 +529,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 0, /* Weakened 40-bit export cipher. */ .name = SSL3_TXT_ADH_RC4_40_MD5, .id = SSL3_CK_ADH_RC4_40_MD5, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_RC4, .algorithm_mac = SSL_MD5, @@ -545,7 +545,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = SSL3_TXT_ADH_RC4_128_MD5, .id = SSL3_CK_ADH_RC4_128_MD5, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_RC4, .algorithm_mac = SSL_MD5, @@ -561,7 +561,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 0, /* Weakened 40-bit export cipher. */ .name = SSL3_TXT_ADH_DES_40_CBC_SHA, .id = SSL3_CK_ADH_DES_40_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_DES, .algorithm_mac = SSL_SHA1, @@ -577,7 +577,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = SSL3_TXT_ADH_DES_64_CBC_SHA, .id = SSL3_CK_ADH_DES_64_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_DES, .algorithm_mac = SSL_SHA1, @@ -593,7 +593,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = SSL3_TXT_ADH_DES_192_CBC_SHA, .id = SSL3_CK_ADH_DES_192_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, @@ -655,7 +655,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_DSS_WITH_AES_128_SHA, .id = TLS1_CK_DHE_DSS_WITH_AES_128_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA1, @@ -670,7 +670,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_RSA_WITH_AES_128_SHA, .id = TLS1_CK_DHE_RSA_WITH_AES_128_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA1, @@ -685,7 +685,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ADH_WITH_AES_128_SHA, .id = TLS1_CK_ADH_WITH_AES_128_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA1, @@ -748,7 +748,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_DSS_WITH_AES_256_SHA, .id = TLS1_CK_DHE_DSS_WITH_AES_256_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA1, @@ -764,7 +764,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_RSA_WITH_AES_256_SHA, .id = TLS1_CK_DHE_RSA_WITH_AES_256_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA1, @@ -780,7 +780,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ADH_WITH_AES_256_SHA, .id = TLS1_CK_ADH_WITH_AES_256_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA1, @@ -877,7 +877,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256, .id = TLS1_CK_DHE_DSS_WITH_AES_128_SHA256, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA256, @@ -944,7 +944,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA, .id = TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_CAMELLIA128, .algorithm_mac = SSL_SHA1, @@ -960,7 +960,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, .id = TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_CAMELLIA128, .algorithm_mac = SSL_SHA1, @@ -976,7 +976,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA, .id = TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_CAMELLIA128, .algorithm_mac = SSL_SHA1, @@ -994,7 +994,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256, .id = TLS1_CK_DHE_RSA_WITH_AES_128_SHA256, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA256, @@ -1042,7 +1042,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256, .id = TLS1_CK_DHE_DSS_WITH_AES_256_SHA256, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA256, @@ -1058,7 +1058,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256, .id = TLS1_CK_DHE_RSA_WITH_AES_256_SHA256, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA256, @@ -1074,7 +1074,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ADH_WITH_AES_128_SHA256, .id = TLS1_CK_ADH_WITH_AES_128_SHA256, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA256, @@ -1090,7 +1090,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ADH_WITH_AES_256_SHA256, .id = TLS1_CK_ADH_WITH_AES_256_SHA256, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA256, @@ -1218,7 +1218,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, .id = TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_CAMELLIA256, .algorithm_mac = SSL_SHA1, @@ -1234,7 +1234,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, .id = TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_CAMELLIA256, .algorithm_mac = SSL_SHA1, @@ -1250,7 +1250,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA, .id = TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_CAMELLIA256, .algorithm_mac = SSL_SHA1, @@ -1306,7 +1306,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256, .id = TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES128GCM, .algorithm_mac = SSL_AEAD, @@ -1324,7 +1324,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384, .id = TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES256GCM, .algorithm_mac = SSL_AEAD, @@ -1378,7 +1378,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256, .id = TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_AES128GCM, .algorithm_mac = SSL_AEAD, @@ -1396,7 +1396,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384, .id = TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aDSS, .algorithm_enc = SSL_AES256GCM, .algorithm_mac = SSL_AEAD, @@ -1450,7 +1450,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256, .id = TLS1_CK_ADH_WITH_AES_128_GCM_SHA256, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_AES128GCM, .algorithm_mac = SSL_AEAD, @@ -1468,7 +1468,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384, .id = TLS1_CK_ADH_WITH_AES_256_GCM_SHA384, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_AES256GCM, .algorithm_mac = SSL_AEAD, @@ -1566,7 +1566,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA, .id = TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_eNULL, .algorithm_mac = SSL_SHA1, @@ -1582,7 +1582,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA, .id = TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_RC4, .algorithm_mac = SSL_SHA1, @@ -1598,7 +1598,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA, .id = TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, @@ -1614,7 +1614,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, .id = TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA1, @@ -1630,7 +1630,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, .id = TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA1, @@ -1726,7 +1726,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA, .id = TLS1_CK_ECDHE_RSA_WITH_NULL_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_eNULL, .algorithm_mac = SSL_SHA1, @@ -1742,7 +1742,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA, .id = TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_RC4, .algorithm_mac = SSL_SHA1, @@ -1758,7 +1758,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA, .id = TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, @@ -1774,7 +1774,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA, .id = TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA1, @@ -1790,7 +1790,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA, .id = TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA1, @@ -1806,7 +1806,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDH_anon_WITH_NULL_SHA, .id = TLS1_CK_ECDH_anon_WITH_NULL_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_eNULL, .algorithm_mac = SSL_SHA1, @@ -1822,7 +1822,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA, .id = TLS1_CK_ECDH_anon_WITH_RC4_128_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_RC4, .algorithm_mac = SSL_SHA1, @@ -1838,7 +1838,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA, .id = TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_3DES, .algorithm_mac = SSL_SHA1, @@ -1854,7 +1854,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA, .id = TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA1, @@ -1870,7 +1870,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA, .id = TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aNULL, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA1, @@ -1889,7 +1889,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256, .id = TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA256, @@ -1905,7 +1905,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384, .id = TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA384, @@ -1953,7 +1953,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256, .id = TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES128, .algorithm_mac = SSL_SHA256, @@ -1969,7 +1969,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384, .id = TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES256, .algorithm_mac = SSL_SHA384, @@ -2019,7 +2019,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, .id = TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_AES128GCM, .algorithm_mac = SSL_AEAD, @@ -2037,7 +2037,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, .id = TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_AES256GCM, .algorithm_mac = SSL_AEAD, @@ -2091,7 +2091,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256, .id = TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES128GCM, .algorithm_mac = SSL_AEAD, @@ -2109,7 +2109,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384, .id = TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_AES256GCM, .algorithm_mac = SSL_AEAD, @@ -2224,7 +2224,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305, .id = TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_CHACHA20POLY1305, .algorithm_mac = SSL_AEAD, @@ -2240,7 +2240,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, .id = TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305, - .algorithm_mkey = SSL_kEECDH, + .algorithm_mkey = SSL_kECDHE, .algorithm_auth = SSL_aECDSA, .algorithm_enc = SSL_CHACHA20POLY1305, .algorithm_mac = SSL_AEAD, @@ -2256,7 +2256,7 @@ SSL_CIPHER ssl3_ciphers[] = { .valid = 1, .name = TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305, .id = TLS1_CK_DHE_RSA_CHACHA20_POLY1305, - .algorithm_mkey = SSL_kEDH, + .algorithm_mkey = SSL_kDHE, .algorithm_auth = SSL_aRSA, .algorithm_enc = SSL_CHACHA20POLY1305, .algorithm_mac = SSL_AEAD, @@ -3069,7 +3069,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, * if we are considering an ECC cipher suite that uses an * ephemeral EC key */ - (alg_k & SSL_kEECDH) + (alg_k & SSL_kECDHE) /* and we have an ephemeral EC key */ && (s->cert->ecdh_tmp != NULL) /* and the client specified an EllipticCurves extension */ @@ -3108,7 +3108,7 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, continue; ii = sk_SSL_CIPHER_find(allow, c); if (ii >= 0) { - if ((alg_k & SSL_kEECDH) && + if ((alg_k & SSL_kECDHE) && (alg_a & SSL_aECDSA) && s->s3->is_probably_safari) { if (!ret) ret = sk_SSL_CIPHER_value(allow, ii); @@ -3139,12 +3139,12 @@ ssl3_get_req_cert_type(SSL *s, unsigned char *p) } #endif - if (alg_k & (SSL_kDHr|SSL_kEDH)) { + if (alg_k & (SSL_kDHr|SSL_kDHE)) { p[ret++] = SSL3_CT_RSA_FIXED_DH; p[ret++] = SSL3_CT_DSS_FIXED_DH; } if ((s->version == SSL3_VERSION) && - (alg_k & (SSL_kEDH|SSL_kDHd|SSL_kDHr))) { + (alg_k & (SSL_kDHE|SSL_kDHd|SSL_kDHr))) { p[ret++] = SSL3_CT_RSA_EPHEMERAL_DH; p[ret++] = SSL3_CT_DSS_EPHEMERAL_DH; } @@ -3157,7 +3157,7 @@ ssl3_get_req_cert_type(SSL *s, unsigned char *p) /* * ECDSA certs can be used with RSA cipher suites as well - * so we don't need to check for SSL_kECDH or SSL_kEECDH + * so we don't need to check for SSL_kECDH or SSL_kECDHE */ if (s->version >= TLS1_VERSION) { p[ret++] = TLS_CT_ECDSA_SIGN; -- cgit v1.2.3-55-g6feb