mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
Update trace code.
Add extension and ciphersuites to trace code. Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson
parent
4336de0c63
commit
9d3356b118
130
ssl/t1_trce.c
130
ssl/t1_trce.c
@ -184,6 +184,9 @@ static 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"},
|
||||
{0x0030, "TLS_DH_DSS_WITH_AES_128_CBC_SHA"},
|
||||
{0x0031, "TLS_DH_RSA_WITH_AES_128_CBC_SHA"},
|
||||
@ -282,6 +285,7 @@ static ssl_trace_tbl ssl_ciphers_tbl[] = {
|
||||
{0x00C4, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256"},
|
||||
{0x00C5, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256"},
|
||||
{0x00FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"},
|
||||
{0x5600, "TLS_FALLBACK_SCSV"},
|
||||
{0xC001, "TLS_ECDH_ECDSA_WITH_NULL_SHA"},
|
||||
{0xC002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"},
|
||||
{0xC003, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"},
|
||||
@ -332,6 +336,131 @@ static ssl_trace_tbl ssl_ciphers_tbl[] = {
|
||||
{0xC030, "TLS_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"},
|
||||
{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"},
|
||||
{0xC03F, "TLS_DH_DSS_WITH_ARIA_256_CBC_SHA384"},
|
||||
{0xC040, "TLS_DH_RSA_WITH_ARIA_128_CBC_SHA256"},
|
||||
{0xC041, "TLS_DH_RSA_WITH_ARIA_256_CBC_SHA384"},
|
||||
{0xC042, "TLS_DHE_DSS_WITH_ARIA_128_CBC_SHA256"},
|
||||
{0xC043, "TLS_DHE_DSS_WITH_ARIA_256_CBC_SHA384"},
|
||||
{0xC044, "TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256"},
|
||||
{0xC045, "TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384"},
|
||||
{0xC046, "TLS_DH_anon_WITH_ARIA_128_CBC_SHA256"},
|
||||
{0xC047, "TLS_DH_anon_WITH_ARIA_256_CBC_SHA384"},
|
||||
{0xC048, "TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256"},
|
||||
{0xC049, "TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384"},
|
||||
{0xC04A, "TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256"},
|
||||
{0xC04B, "TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384"},
|
||||
{0xC04C, "TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256"},
|
||||
{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"},
|
||||
{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"},
|
||||
{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"},
|
||||
{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"},
|
||||
{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"},
|
||||
{0xC07B, "TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC07C, "TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC07D, "TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC07E, "TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC07F, "TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC080, "TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC081, "TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC082, "TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC083, "TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC084, "TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC085, "TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC086, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC087, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC088, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC089, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC08A, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC08B, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC08C, "TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC08D, "TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC08E, "TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{0xC08F, "TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384"},
|
||||
{0xC090, "TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256"},
|
||||
{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"},
|
||||
{0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},
|
||||
{0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"},
|
||||
};
|
||||
@ -364,6 +493,7 @@ static ssl_trace_tbl ssl_exts_tbl[] = {
|
||||
{TLSEXT_TYPE_renegotiate, "renegotiate"},
|
||||
{TLSEXT_TYPE_next_proto_neg, "next_proto_neg"},
|
||||
{TLSEXT_TYPE_padding, "padding"},
|
||||
{TLSEXT_TYPE_encrypt_then_mac, "encrypt_then_mac"},
|
||||
{TLSEXT_TYPE_extended_master_secret, "extended_master_secret"}
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user