From 76cbb5cd154b234689e09222cd7821ba7128831a Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Tue, 2 Jan 2018 17:08:30 +0100 Subject: [PATCH] Add TLS 1.3 cipher suites --- ssl/ssl.enums | 7 +++++++ ssl/ssl.enums.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/ssl/ssl.enums b/ssl/ssl.enums index 9495e20..b697d09 100644 --- a/ssl/ssl.enums +++ b/ssl/ssl.enums @@ -656,6 +656,13 @@ ClientKeyExchange(16) CipherSuite TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256 = { 0xCC,0xAD }; CipherSuite TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256 = { 0xCC,0xAE }; CipherSuite TLS_FALLBACK_SCSV = { 0x56,0x00 }; + // New PSK ciphers introduced by TLS 1.3 + // https://tlswg.github.io/tls13-spec/#rfc.appendix.A.4 + CipherSuite TLS_AES_128_GCM_SHA256 = { 0x13,0x01 }; + CipherSuite TLS_AES_256_GCM_SHA384 = { 0x13,0x02 }; + CipherSuite TLS_CHACHA20_POLY1305_SHA256 = { 0x13,0x03 }; + CipherSuite TLS_AES_128_CCM_SHA256 = { 0x13,0x04 }; + CipherSuite TLS_AES_128_CCM_8_SHA256 = { 0x13,0x05 }; // DRAFT-IETF-TLS-ECC CipherSuite TLS_ECDH_ECDSA_WITH_NULL_SHA = { 0x00,0x47 }; CipherSuite TLS_ECDH_ECDSA_WITH_RC4_128_SHA = { 0x00,0x48 }; diff --git a/ssl/ssl.enums.c b/ssl/ssl.enums.c index 2d49cfa..57bf9a9 100644 --- a/ssl/ssl.enums.c +++ b/ssl/ssl.enums.c @@ -1083,6 +1083,26 @@ decoder cipher_suite_decoder[]={ 255, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV", 0 }, + { + 4865, + "TLS_AES_128_GCM_SHA256", + 0 }, + { + 4866, + "TLS_AES_256_GCM_SHA384", + 0 }, + { + 4867, + "TLS_CHACHA20_POLY1305_SHA256", + 0 }, + { + 4868, + "TLS_AES_128_CCM_SHA256", + 0 }, + { + 4869, + "TLS_AES_128_CCM_8_SHA256", + 0 }, { 22016, "TLS_FALLBACK_SCSV",