Commit e5ff85fd77 for openssl.org
commit e5ff85fd777aee8fd6bd1c8136d8041b5c4fbc78
Author: Milan Broz <gmazyland@gmail.com>
Date: Tue Feb 17 13:18:10 2026 +0100
Use defined TLS cipher suite names in SSL trace
This should use #define strings instead of duplication.
Not everything is defined, though.
Fixes openssl/project#1875
Co-Authored-By: Claude Opus 4.6 Extended <noreply@anthropic.com>
Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
MergeDate: Wed Feb 18 16:01:18 2026
(Merged from https://github.com/openssl/openssl/pull/30042)
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 2e0266c94d..c86c21f362 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -109,16 +109,16 @@ static const ssl_trace_tbl ssl_handshake_tbl[] = {
/* Cipher suites */
static const ssl_trace_tbl ssl_ciphers_tbl[] = {
{ 0x0000, "TLS_NULL_WITH_NULL_NULL" },
- { 0x0001, "TLS_RSA_WITH_NULL_MD5" },
- { 0x0002, "TLS_RSA_WITH_NULL_SHA" },
+ { 0x0001, SSL3_RFC_RSA_NULL_MD5 },
+ { 0x0002, SSL3_RFC_RSA_NULL_SHA },
{ 0x0003, "TLS_RSA_EXPORT_WITH_RC4_40_MD5" },
- { 0x0004, "TLS_RSA_WITH_RC4_128_MD5" },
- { 0x0005, "TLS_RSA_WITH_RC4_128_SHA" },
+ { 0x0004, SSL3_RFC_RSA_RC4_128_MD5 },
+ { 0x0005, SSL3_RFC_RSA_RC4_128_SHA },
{ 0x0006, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5" },
- { 0x0007, "TLS_RSA_WITH_IDEA_CBC_SHA" },
+ { 0x0007, SSL3_RFC_RSA_IDEA_128_SHA },
{ 0x0008, "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA" },
{ 0x0009, "TLS_RSA_WITH_DES_CBC_SHA" },
- { 0x000A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA" },
+ { 0x000A, SSL3_RFC_RSA_DES_192_CBC3_SHA },
{ 0x000B, "TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA" },
{ 0x000C, "TLS_DH_DSS_WITH_DES_CBC_SHA" },
{ 0x000D, "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA" },
@@ -127,15 +127,15 @@ static const ssl_trace_tbl ssl_ciphers_tbl[] = {
{ 0x0010, "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA" },
{ 0x0011, "TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA" },
{ 0x0012, "TLS_DHE_DSS_WITH_DES_CBC_SHA" },
- { 0x0013, "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA" },
+ { 0x0013, SSL3_RFC_DHE_DSS_DES_192_CBC3_SHA },
{ 0x0014, "TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA" },
{ 0x0015, "TLS_DHE_RSA_WITH_DES_CBC_SHA" },
- { 0x0016, "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA" },
+ { 0x0016, SSL3_RFC_DHE_RSA_DES_192_CBC3_SHA },
{ 0x0017, "TLS_DH_anon_EXPORT_WITH_RC4_40_MD5" },
- { 0x0018, "TLS_DH_anon_WITH_RC4_128_MD5" },
+ { 0x0018, SSL3_RFC_ADH_RC4_128_MD5 },
{ 0x0019, "TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA" },
{ 0x001A, "TLS_DH_anon_WITH_DES_CBC_SHA" },
- { 0x001B, "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA" },
+ { 0x001B, SSL3_RFC_ADH_DES_192_CBC_SHA },
{ 0x001D, "SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA" },
{ 0x001E, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA" },
{ 0x001F, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA" },
@@ -151,108 +151,108 @@ static const ssl_trace_tbl ssl_ciphers_tbl[] = {
{ 0x0029, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5" },
{ 0x002A, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5" },
{ 0x002B, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5" },
- { 0x002C, "TLS_PSK_WITH_NULL_SHA" },
- { 0x002D, "TLS_DHE_PSK_WITH_NULL_SHA" },
- { 0x002E, "TLS_RSA_PSK_WITH_NULL_SHA" },
- { 0x002F, "TLS_RSA_WITH_AES_128_CBC_SHA" },
+ { 0x002C, TLS1_RFC_PSK_WITH_NULL_SHA },
+ { 0x002D, TLS1_RFC_DHE_PSK_WITH_NULL_SHA },
+ { 0x002E, TLS1_RFC_RSA_PSK_WITH_NULL_SHA },
+ { 0x002F, TLS1_RFC_RSA_WITH_AES_128_SHA },
{ 0x0030, "TLS_DH_DSS_WITH_AES_128_CBC_SHA" },
{ 0x0031, "TLS_DH_RSA_WITH_AES_128_CBC_SHA" },
- { 0x0032, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA" },
- { 0x0033, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA" },
- { 0x0034, "TLS_DH_anon_WITH_AES_128_CBC_SHA" },
- { 0x0035, "TLS_RSA_WITH_AES_256_CBC_SHA" },
+ { 0x0032, TLS1_RFC_DHE_DSS_WITH_AES_128_SHA },
+ { 0x0033, TLS1_RFC_DHE_RSA_WITH_AES_128_SHA },
+ { 0x0034, TLS1_RFC_ADH_WITH_AES_128_SHA },
+ { 0x0035, TLS1_RFC_RSA_WITH_AES_256_SHA },
{ 0x0036, "TLS_DH_DSS_WITH_AES_256_CBC_SHA" },
{ 0x0037, "TLS_DH_RSA_WITH_AES_256_CBC_SHA" },
- { 0x0038, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA" },
- { 0x0039, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA" },
- { 0x003A, "TLS_DH_anon_WITH_AES_256_CBC_SHA" },
- { 0x003B, "TLS_RSA_WITH_NULL_SHA256" },
- { 0x003C, "TLS_RSA_WITH_AES_128_CBC_SHA256" },
- { 0x003D, "TLS_RSA_WITH_AES_256_CBC_SHA256" },
+ { 0x0038, TLS1_RFC_DHE_DSS_WITH_AES_256_SHA },
+ { 0x0039, TLS1_RFC_DHE_RSA_WITH_AES_256_SHA },
+ { 0x003A, TLS1_RFC_ADH_WITH_AES_256_SHA },
+ { 0x003B, TLS1_RFC_RSA_WITH_NULL_SHA256 },
+ { 0x003C, TLS1_RFC_RSA_WITH_AES_128_SHA256 },
+ { 0x003D, TLS1_RFC_RSA_WITH_AES_256_SHA256 },
{ 0x003E, "TLS_DH_DSS_WITH_AES_128_CBC_SHA256" },
{ 0x003F, "TLS_DH_RSA_WITH_AES_128_CBC_SHA256" },
- { 0x0040, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256" },
- { 0x0041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+ { 0x0040, TLS1_RFC_DHE_DSS_WITH_AES_128_SHA256 },
+ { 0x0041, TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA },
{ 0x0042, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA" },
{ 0x0043, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA" },
- { 0x0044, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA" },
- { 0x0045, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA" },
- { 0x0046, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA" },
- { 0x0067, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256" },
+ { 0x0044, TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA },
+ { 0x0045, TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA },
+ { 0x0046, TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA },
+ { 0x0067, TLS1_RFC_DHE_RSA_WITH_AES_128_SHA256 },
{ 0x0068, "TLS_DH_DSS_WITH_AES_256_CBC_SHA256" },
{ 0x0069, "TLS_DH_RSA_WITH_AES_256_CBC_SHA256" },
- { 0x006A, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256" },
- { 0x006B, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256" },
- { 0x006C, "TLS_DH_anon_WITH_AES_128_CBC_SHA256" },
- { 0x006D, "TLS_DH_anon_WITH_AES_256_CBC_SHA256" },
+ { 0x006A, TLS1_RFC_DHE_DSS_WITH_AES_256_SHA256 },
+ { 0x006B, TLS1_RFC_DHE_RSA_WITH_AES_256_SHA256 },
+ { 0x006C, TLS1_RFC_ADH_WITH_AES_128_SHA256 },
+ { 0x006D, TLS1_RFC_ADH_WITH_AES_256_SHA256 },
{ 0x0081, "TLS_GOSTR341001_WITH_28147_CNT_IMIT" },
{ 0x0083, "TLS_GOSTR341001_WITH_NULL_GOSTR3411" },
- { 0x0084, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA" },
+ { 0x0084, TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA },
{ 0x0085, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA" },
{ 0x0086, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA" },
- { 0x0087, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA" },
- { 0x0088, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA" },
- { 0x0089, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA" },
- { 0x008A, "TLS_PSK_WITH_RC4_128_SHA" },
- { 0x008B, "TLS_PSK_WITH_3DES_EDE_CBC_SHA" },
- { 0x008C, "TLS_PSK_WITH_AES_128_CBC_SHA" },
- { 0x008D, "TLS_PSK_WITH_AES_256_CBC_SHA" },
- { 0x008E, "TLS_DHE_PSK_WITH_RC4_128_SHA" },
- { 0x008F, "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA" },
- { 0x0090, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA" },
- { 0x0091, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA" },
- { 0x0092, "TLS_RSA_PSK_WITH_RC4_128_SHA" },
- { 0x0093, "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA" },
- { 0x0094, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA" },
- { 0x0095, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA" },
- { 0x0096, "TLS_RSA_WITH_SEED_CBC_SHA" },
+ { 0x0087, TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA },
+ { 0x0088, TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA },
+ { 0x0089, TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA },
+ { 0x008A, TLS1_RFC_PSK_WITH_RC4_128_SHA },
+ { 0x008B, TLS1_RFC_PSK_WITH_3DES_EDE_CBC_SHA },
+ { 0x008C, TLS1_RFC_PSK_WITH_AES_128_CBC_SHA },
+ { 0x008D, TLS1_RFC_PSK_WITH_AES_256_CBC_SHA },
+ { 0x008E, TLS1_RFC_DHE_PSK_WITH_RC4_128_SHA },
+ { 0x008F, TLS1_RFC_DHE_PSK_WITH_3DES_EDE_CBC_SHA },
+ { 0x0090, TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA },
+ { 0x0091, TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA },
+ { 0x0092, TLS1_RFC_RSA_PSK_WITH_RC4_128_SHA },
+ { 0x0093, TLS1_RFC_RSA_PSK_WITH_3DES_EDE_CBC_SHA },
+ { 0x0094, TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA },
+ { 0x0095, TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA },
+ { 0x0096, TLS1_RFC_RSA_WITH_SEED_SHA },
{ 0x0097, "TLS_DH_DSS_WITH_SEED_CBC_SHA" },
{ 0x0098, "TLS_DH_RSA_WITH_SEED_CBC_SHA" },
- { 0x0099, "TLS_DHE_DSS_WITH_SEED_CBC_SHA" },
- { 0x009A, "TLS_DHE_RSA_WITH_SEED_CBC_SHA" },
- { 0x009B, "TLS_DH_anon_WITH_SEED_CBC_SHA" },
- { 0x009C, "TLS_RSA_WITH_AES_128_GCM_SHA256" },
- { 0x009D, "TLS_RSA_WITH_AES_256_GCM_SHA384" },
- { 0x009E, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" },
- { 0x009F, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0x0099, TLS1_RFC_DHE_DSS_WITH_SEED_SHA },
+ { 0x009A, TLS1_RFC_DHE_RSA_WITH_SEED_SHA },
+ { 0x009B, TLS1_RFC_ADH_WITH_SEED_SHA },
+ { 0x009C, TLS1_RFC_RSA_WITH_AES_128_GCM_SHA256 },
+ { 0x009D, TLS1_RFC_RSA_WITH_AES_256_GCM_SHA384 },
+ { 0x009E, TLS1_RFC_DHE_RSA_WITH_AES_128_GCM_SHA256 },
+ { 0x009F, TLS1_RFC_DHE_RSA_WITH_AES_256_GCM_SHA384 },
{ 0x00A0, "TLS_DH_RSA_WITH_AES_128_GCM_SHA256" },
{ 0x00A1, "TLS_DH_RSA_WITH_AES_256_GCM_SHA384" },
- { 0x00A2, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256" },
- { 0x00A3, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384" },
+ { 0x00A2, TLS1_RFC_DHE_DSS_WITH_AES_128_GCM_SHA256 },
+ { 0x00A3, TLS1_RFC_DHE_DSS_WITH_AES_256_GCM_SHA384 },
{ 0x00A4, "TLS_DH_DSS_WITH_AES_128_GCM_SHA256" },
{ 0x00A5, "TLS_DH_DSS_WITH_AES_256_GCM_SHA384" },
- { 0x00A6, "TLS_DH_anon_WITH_AES_128_GCM_SHA256" },
- { 0x00A7, "TLS_DH_anon_WITH_AES_256_GCM_SHA384" },
- { 0x00A8, "TLS_PSK_WITH_AES_128_GCM_SHA256" },
- { 0x00A9, "TLS_PSK_WITH_AES_256_GCM_SHA384" },
- { 0x00AA, "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256" },
- { 0x00AB, "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384" },
- { 0x00AC, "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256" },
- { 0x00AD, "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384" },
- { 0x00AE, "TLS_PSK_WITH_AES_128_CBC_SHA256" },
- { 0x00AF, "TLS_PSK_WITH_AES_256_CBC_SHA384" },
- { 0x00B0, "TLS_PSK_WITH_NULL_SHA256" },
- { 0x00B1, "TLS_PSK_WITH_NULL_SHA384" },
- { 0x00B2, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256" },
- { 0x00B3, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384" },
- { 0x00B4, "TLS_DHE_PSK_WITH_NULL_SHA256" },
- { 0x00B5, "TLS_DHE_PSK_WITH_NULL_SHA384" },
- { 0x00B6, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256" },
- { 0x00B7, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384" },
- { 0x00B8, "TLS_RSA_PSK_WITH_NULL_SHA256" },
- { 0x00B9, "TLS_RSA_PSK_WITH_NULL_SHA384" },
- { 0x00BA, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+ { 0x00A6, TLS1_RFC_ADH_WITH_AES_128_GCM_SHA256 },
+ { 0x00A7, TLS1_RFC_ADH_WITH_AES_256_GCM_SHA384 },
+ { 0x00A8, TLS1_RFC_PSK_WITH_AES_128_GCM_SHA256 },
+ { 0x00A9, TLS1_RFC_PSK_WITH_AES_256_GCM_SHA384 },
+ { 0x00AA, TLS1_RFC_DHE_PSK_WITH_AES_128_GCM_SHA256 },
+ { 0x00AB, TLS1_RFC_DHE_PSK_WITH_AES_256_GCM_SHA384 },
+ { 0x00AC, TLS1_RFC_RSA_PSK_WITH_AES_128_GCM_SHA256 },
+ { 0x00AD, TLS1_RFC_RSA_PSK_WITH_AES_256_GCM_SHA384 },
+ { 0x00AE, TLS1_RFC_PSK_WITH_AES_128_CBC_SHA256 },
+ { 0x00AF, TLS1_RFC_PSK_WITH_AES_256_CBC_SHA384 },
+ { 0x00B0, TLS1_RFC_PSK_WITH_NULL_SHA256 },
+ { 0x00B1, TLS1_RFC_PSK_WITH_NULL_SHA384 },
+ { 0x00B2, TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA256 },
+ { 0x00B3, TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA384 },
+ { 0x00B4, TLS1_RFC_DHE_PSK_WITH_NULL_SHA256 },
+ { 0x00B5, TLS1_RFC_DHE_PSK_WITH_NULL_SHA384 },
+ { 0x00B6, TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA256 },
+ { 0x00B7, TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA384 },
+ { 0x00B8, TLS1_RFC_RSA_PSK_WITH_NULL_SHA256 },
+ { 0x00B9, TLS1_RFC_RSA_PSK_WITH_NULL_SHA384 },
+ { 0x00BA, TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA256 },
{ 0x00BB, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
{ 0x00BC, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0x00BD, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0x00BE, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0x00BF, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0x00C0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 0x00BD, TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256 },
+ { 0x00BE, TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 },
+ { 0x00BF, TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA256 },
+ { 0x00C0, TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA256 },
{ 0x00C1, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256" },
{ 0x00C2, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
- { 0x00C3, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256" },
- { 0x00C4, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
- { 0x00C5, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256" },
+ { 0x00C3, TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 },
+ { 0x00C4, TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 },
+ { 0x00C5, TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA256 },
{ 0x00FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" },
{ 0x5600, "TLS_FALLBACK_SCSV" },
{ 0xC001, "TLS_ECDH_ECDSA_WITH_NULL_SHA" },
@@ -260,60 +260,60 @@ static const ssl_trace_tbl ssl_ciphers_tbl[] = {
{ 0xC003, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA" },
{ 0xC004, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA" },
{ 0xC005, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA" },
- { 0xC006, "TLS_ECDHE_ECDSA_WITH_NULL_SHA" },
- { 0xC007, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA" },
- { 0xC008, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA" },
- { 0xC009, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA" },
- { 0xC00A, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" },
+ { 0xC006, TLS1_RFC_ECDHE_ECDSA_WITH_NULL_SHA },
+ { 0xC007, TLS1_RFC_ECDHE_ECDSA_WITH_RC4_128_SHA },
+ { 0xC008, TLS1_RFC_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA },
+ { 0xC009, TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CBC_SHA },
+ { 0xC00A, TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CBC_SHA },
{ 0xC00B, "TLS_ECDH_RSA_WITH_NULL_SHA" },
{ 0xC00C, "TLS_ECDH_RSA_WITH_RC4_128_SHA" },
{ 0xC00D, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA" },
{ 0xC00E, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA" },
{ 0xC00F, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA" },
- { 0xC010, "TLS_ECDHE_RSA_WITH_NULL_SHA" },
- { 0xC011, "TLS_ECDHE_RSA_WITH_RC4_128_SHA" },
- { 0xC012, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA" },
- { 0xC013, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" },
- { 0xC014, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA" },
- { 0xC015, "TLS_ECDH_anon_WITH_NULL_SHA" },
- { 0xC016, "TLS_ECDH_anon_WITH_RC4_128_SHA" },
- { 0xC017, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA" },
- { 0xC018, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA" },
- { 0xC019, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA" },
- { 0xC01A, "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA" },
- { 0xC01B, "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA" },
- { 0xC01C, "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA" },
- { 0xC01D, "TLS_SRP_SHA_WITH_AES_128_CBC_SHA" },
- { 0xC01E, "TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA" },
- { 0xC01F, "TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA" },
- { 0xC020, "TLS_SRP_SHA_WITH_AES_256_CBC_SHA" },
- { 0xC021, "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA" },
- { 0xC022, "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA" },
- { 0xC023, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" },
- { 0xC024, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" },
+ { 0xC010, TLS1_RFC_ECDHE_RSA_WITH_NULL_SHA },
+ { 0xC011, TLS1_RFC_ECDHE_RSA_WITH_RC4_128_SHA },
+ { 0xC012, TLS1_RFC_ECDHE_RSA_WITH_DES_192_CBC3_SHA },
+ { 0xC013, TLS1_RFC_ECDHE_RSA_WITH_AES_128_CBC_SHA },
+ { 0xC014, TLS1_RFC_ECDHE_RSA_WITH_AES_256_CBC_SHA },
+ { 0xC015, TLS1_RFC_ECDH_anon_WITH_NULL_SHA },
+ { 0xC016, TLS1_RFC_ECDH_anon_WITH_RC4_128_SHA },
+ { 0xC017, TLS1_RFC_ECDH_anon_WITH_DES_192_CBC3_SHA },
+ { 0xC018, TLS1_RFC_ECDH_anon_WITH_AES_128_CBC_SHA },
+ { 0xC019, TLS1_RFC_ECDH_anon_WITH_AES_256_CBC_SHA },
+ { 0xC01A, TLS1_RFC_SRP_SHA_WITH_3DES_EDE_CBC_SHA },
+ { 0xC01B, TLS1_RFC_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA },
+ { 0xC01C, TLS1_RFC_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA },
+ { 0xC01D, TLS1_RFC_SRP_SHA_WITH_AES_128_CBC_SHA },
+ { 0xC01E, TLS1_RFC_SRP_SHA_RSA_WITH_AES_128_CBC_SHA },
+ { 0xC01F, TLS1_RFC_SRP_SHA_DSS_WITH_AES_128_CBC_SHA },
+ { 0xC020, TLS1_RFC_SRP_SHA_WITH_AES_256_CBC_SHA },
+ { 0xC021, TLS1_RFC_SRP_SHA_RSA_WITH_AES_256_CBC_SHA },
+ { 0xC022, TLS1_RFC_SRP_SHA_DSS_WITH_AES_256_CBC_SHA },
+ { 0xC023, TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_SHA256 },
+ { 0xC024, TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_SHA384 },
{ 0xC025, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256" },
{ 0xC026, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384" },
- { 0xC027, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" },
- { 0xC028, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" },
+ { 0xC027, TLS1_RFC_ECDHE_RSA_WITH_AES_128_SHA256 },
+ { 0xC028, TLS1_RFC_ECDHE_RSA_WITH_AES_256_SHA384 },
{ 0xC029, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256" },
{ 0xC02A, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384" },
- { 0xC02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" },
- { 0xC02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" },
+ { 0xC02B, TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 },
+ { 0xC02C, TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 },
{ 0xC02D, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256" },
{ 0xC02E, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384" },
- { 0xC02F, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" },
- { 0xC030, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" },
+ { 0xC02F, TLS1_RFC_ECDHE_RSA_WITH_AES_128_GCM_SHA256 },
+ { 0xC030, TLS1_RFC_ECDHE_RSA_WITH_AES_256_GCM_SHA384 },
{ 0xC031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256" },
{ 0xC032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384" },
- { 0xC033, "TLS_ECDHE_PSK_WITH_RC4_128_SHA" },
- { 0xC034, "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA" },
- { 0xC035, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA" },
- { 0xC036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA" },
- { 0xC037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256" },
- { 0xC038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384" },
- { 0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA" },
- { 0xC03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256" },
- { 0xC03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384" },
+ { 0xC033, TLS1_RFC_ECDHE_PSK_WITH_RC4_128_SHA },
+ { 0xC034, TLS1_RFC_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA },
+ { 0xC035, TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA },
+ { 0xC036, TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA },
+ { 0xC037, TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA256 },
+ { 0xC038, TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA384 },
+ { 0xC039, TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA },
+ { 0xC03A, TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA256 },
+ { 0xC03B, TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA384 },
{ 0xC03C, "TLS_RSA_WITH_ARIA_128_CBC_SHA256" },
{ 0xC03D, "TLS_RSA_WITH_ARIA_256_CBC_SHA384" },
{ 0xC03E, "TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256" },
@@ -334,46 +334,46 @@ static const ssl_trace_tbl ssl_ciphers_tbl[] = {
{ 0xC04D, "TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384" },
{ 0xC04E, "TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256" },
{ 0xC04F, "TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384" },
- { 0xC050, "TLS_RSA_WITH_ARIA_128_GCM_SHA256" },
- { 0xC051, "TLS_RSA_WITH_ARIA_256_GCM_SHA384" },
- { 0xC052, "TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256" },
- { 0xC053, "TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384" },
- { 0xC054, "TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256" },
- { 0xC055, "TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384" },
- { 0xC056, "TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256" },
- { 0xC057, "TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384" },
- { 0xC058, "TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256" },
- { 0xC059, "TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384" },
- { 0xC05A, "TLS_DH_anon_WITH_ARIA_128_GCM_SHA256" },
- { 0xC05B, "TLS_DH_anon_WITH_ARIA_256_GCM_SHA384" },
- { 0xC05C, "TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256" },
- { 0xC05D, "TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384" },
- { 0xC05E, "TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256" },
- { 0xC05F, "TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384" },
- { 0xC060, "TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256" },
- { 0xC061, "TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384" },
- { 0xC062, "TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256" },
- { 0xC063, "TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384" },
+ { 0xC050, TLS1_RFC_RSA_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC051, TLS1_RFC_RSA_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC052, TLS1_RFC_DHE_RSA_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC053, TLS1_RFC_DHE_RSA_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC054, TLS1_RFC_DH_RSA_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC055, TLS1_RFC_DH_RSA_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC056, TLS1_RFC_DHE_DSS_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC057, TLS1_RFC_DHE_DSS_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC058, TLS1_RFC_DH_DSS_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC059, TLS1_RFC_DH_DSS_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC05A, TLS1_RFC_DH_anon_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC05B, TLS1_RFC_DH_anon_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC05C, TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC05D, TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC05E, TLS1_RFC_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC05F, TLS1_RFC_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC060, TLS1_RFC_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC061, TLS1_RFC_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC062, TLS1_RFC_ECDH_RSA_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC063, TLS1_RFC_ECDH_RSA_WITH_ARIA_256_GCM_SHA384 },
{ 0xC064, "TLS_PSK_WITH_ARIA_128_CBC_SHA256" },
{ 0xC065, "TLS_PSK_WITH_ARIA_256_CBC_SHA384" },
{ 0xC066, "TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256" },
{ 0xC067, "TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384" },
{ 0xC068, "TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256" },
{ 0xC069, "TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384" },
- { 0xC06A, "TLS_PSK_WITH_ARIA_128_GCM_SHA256" },
- { 0xC06B, "TLS_PSK_WITH_ARIA_256_GCM_SHA384" },
- { 0xC06C, "TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256" },
- { 0xC06D, "TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384" },
- { 0xC06E, "TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256" },
- { 0xC06F, "TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384" },
+ { 0xC06A, TLS1_RFC_PSK_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC06B, TLS1_RFC_PSK_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC06C, TLS1_RFC_DHE_PSK_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC06D, TLS1_RFC_DHE_PSK_WITH_ARIA_256_GCM_SHA384 },
+ { 0xC06E, TLS1_RFC_RSA_PSK_WITH_ARIA_128_GCM_SHA256 },
+ { 0xC06F, TLS1_RFC_RSA_PSK_WITH_ARIA_256_GCM_SHA384 },
{ 0xC070, "TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256" },
{ 0xC071, "TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384" },
- { 0xC072, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0xC073, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384" },
+ { 0xC072, TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 },
+ { 0xC073, TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 },
{ 0xC074, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256" },
{ 0xC075, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384" },
- { 0xC076, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0xC077, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384" },
+ { 0xC076, TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 },
+ { 0xC077, TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384 },
{ 0xC078, "TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
{ 0xC079, "TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384" },
{ 0xC07A, "TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
@@ -402,53 +402,53 @@ static const ssl_trace_tbl ssl_ciphers_tbl[] = {
{ 0xC091, "TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384" },
{ 0xC092, "TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256" },
{ 0xC093, "TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384" },
- { 0xC094, "TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0xC095, "TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
- { 0xC096, "TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0xC097, "TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
- { 0xC098, "TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0xC099, "TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
- { 0xC09A, "TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
- { 0xC09B, "TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
- { 0xC09C, "TLS_RSA_WITH_AES_128_CCM" },
- { 0xC09D, "TLS_RSA_WITH_AES_256_CCM" },
- { 0xC09E, "TLS_DHE_RSA_WITH_AES_128_CCM" },
- { 0xC09F, "TLS_DHE_RSA_WITH_AES_256_CCM" },
- { 0xC0A0, "TLS_RSA_WITH_AES_128_CCM_8" },
- { 0xC0A1, "TLS_RSA_WITH_AES_256_CCM_8" },
- { 0xC0A2, "TLS_DHE_RSA_WITH_AES_128_CCM_8" },
- { 0xC0A3, "TLS_DHE_RSA_WITH_AES_256_CCM_8" },
- { 0xC0A4, "TLS_PSK_WITH_AES_128_CCM" },
- { 0xC0A5, "TLS_PSK_WITH_AES_256_CCM" },
- { 0xC0A6, "TLS_DHE_PSK_WITH_AES_128_CCM" },
- { 0xC0A7, "TLS_DHE_PSK_WITH_AES_256_CCM" },
- { 0xC0A8, "TLS_PSK_WITH_AES_128_CCM_8" },
- { 0xC0A9, "TLS_PSK_WITH_AES_256_CCM_8" },
- { 0xC0AA, "TLS_PSK_DHE_WITH_AES_128_CCM_8" },
- { 0xC0AB, "TLS_PSK_DHE_WITH_AES_256_CCM_8" },
- { 0xC0AC, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM" },
- { 0xC0AD, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM" },
- { 0xC0AE, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8" },
- { 0xC0AF, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8" },
+ { 0xC094, TLS1_RFC_PSK_WITH_CAMELLIA_128_CBC_SHA256 },
+ { 0xC095, TLS1_RFC_PSK_WITH_CAMELLIA_256_CBC_SHA384 },
+ { 0xC096, TLS1_RFC_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 },
+ { 0xC097, TLS1_RFC_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 },
+ { 0xC098, TLS1_RFC_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 },
+ { 0xC099, TLS1_RFC_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 },
+ { 0xC09A, TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 },
+ { 0xC09B, TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 },
+ { 0xC09C, TLS1_RFC_RSA_WITH_AES_128_CCM },
+ { 0xC09D, TLS1_RFC_RSA_WITH_AES_256_CCM },
+ { 0xC09E, TLS1_RFC_DHE_RSA_WITH_AES_128_CCM },
+ { 0xC09F, TLS1_RFC_DHE_RSA_WITH_AES_256_CCM },
+ { 0xC0A0, TLS1_RFC_RSA_WITH_AES_128_CCM_8 },
+ { 0xC0A1, TLS1_RFC_RSA_WITH_AES_256_CCM_8 },
+ { 0xC0A2, TLS1_RFC_DHE_RSA_WITH_AES_128_CCM_8 },
+ { 0xC0A3, TLS1_RFC_DHE_RSA_WITH_AES_256_CCM_8 },
+ { 0xC0A4, TLS1_RFC_PSK_WITH_AES_128_CCM },
+ { 0xC0A5, TLS1_RFC_PSK_WITH_AES_256_CCM },
+ { 0xC0A6, TLS1_RFC_DHE_PSK_WITH_AES_128_CCM },
+ { 0xC0A7, TLS1_RFC_DHE_PSK_WITH_AES_256_CCM },
+ { 0xC0A8, TLS1_RFC_PSK_WITH_AES_128_CCM_8 },
+ { 0xC0A9, TLS1_RFC_PSK_WITH_AES_256_CCM_8 },
+ { 0xC0AA, TLS1_RFC_DHE_PSK_WITH_AES_128_CCM_8 },
+ { 0xC0AB, TLS1_RFC_DHE_PSK_WITH_AES_256_CCM_8 },
+ { 0xC0AC, TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM },
+ { 0xC0AD, TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM },
+ { 0xC0AE, TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM_8 },
+ { 0xC0AF, TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM_8 },
{ 0xC102, "IANA-GOST2012-GOST8912-GOST8912" },
- { 0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
- { 0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" },
- { 0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
- { 0xCCAB, "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256" },
- { 0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
- { 0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
- { 0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256" },
- { 0x1301, "TLS_AES_128_GCM_SHA256" },
- { 0x1302, "TLS_AES_256_GCM_SHA384" },
- { 0x1303, "TLS_CHACHA20_POLY1305_SHA256" },
- { 0x1304, "TLS_AES_128_CCM_SHA256" },
- { 0x1305, "TLS_AES_128_CCM_8_SHA256" },
+ { 0xCCA8, TLS1_RFC_ECDHE_RSA_WITH_CHACHA20_POLY1305 },
+ { 0xCCA9, TLS1_RFC_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 },
+ { 0xCCAA, TLS1_RFC_DHE_RSA_WITH_CHACHA20_POLY1305 },
+ { 0xCCAB, TLS1_RFC_PSK_WITH_CHACHA20_POLY1305 },
+ { 0xCCAC, TLS1_RFC_ECDHE_PSK_WITH_CHACHA20_POLY1305 },
+ { 0xCCAD, TLS1_RFC_DHE_PSK_WITH_CHACHA20_POLY1305 },
+ { 0xCCAE, TLS1_RFC_RSA_PSK_WITH_CHACHA20_POLY1305 },
+ { 0x1301, TLS1_3_RFC_AES_128_GCM_SHA256 },
+ { 0x1302, TLS1_3_RFC_AES_256_GCM_SHA384 },
+ { 0x1303, TLS1_3_RFC_CHACHA20_POLY1305_SHA256 },
+ { 0x1304, TLS1_3_RFC_AES_128_CCM_SHA256 },
+ { 0x1305, TLS1_3_RFC_AES_128_CCM_8_SHA256 },
{ 0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA" },
{ 0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA" },
{ 0xFF85, "LEGACY-GOST2012-GOST8912-GOST8912" },
{ 0xFF87, "GOST2012-NULL-GOST12" },
- { 0xC0B4, "TLS_SHA256_SHA256" },
- { 0xC0B5, "TLS_SHA384_SHA384" },
+ { 0xC0B4, TLS1_3_RFC_SHA256_SHA256 },
+ { 0xC0B5, TLS1_3_RFC_SHA384_SHA384 },
{ 0xC100, "GOST2012-KUZNYECHIK-KUZNYECHIKOMAC" },
{ 0xC101, "GOST2012-MAGMA-MAGMAOMAC" },
};