diff options
author | Wan-Teh Chang <wtc@google.com> | 2013-08-23 12:17:08 -0700 |
---|---|---|
committer | Wan-Teh Chang <wtc@google.com> | 2013-08-23 12:17:08 -0700 |
commit | 1220d1fb9af7dc8dce66869d1fd3dd2d3c2a7400 (patch) | |
tree | c9d35e9e5258c0e154d6a67b85b489584f6e9825 | |
parent | 228dc418404939848a65a6bc13f12cf96dbf2c11 (diff) | |
download | nss-hg-1220d1fb9af7dc8dce66869d1fd3dd2d3c2a7400.tar.gz |
Bug 880543: Add the following AES-GCM cipher suites:
CipherSuite TLS_RSA_WITH_AES_128_GCM_SHA256 = {0x00,0x9C}
CipherSuite TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 = {0x00,0x9E}
CipherSuite TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = {0xC0,0x2F}
r=kaie.
-rw-r--r-- | cmd/ssltap/ssltap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/ssltap/ssltap.c b/cmd/ssltap/ssltap.c index d83a489cc..b1eaaa635 100644 --- a/cmd/ssltap/ssltap.c +++ b/cmd/ssltap/ssltap.c @@ -399,6 +399,8 @@ const char * V2CipherString(int cs_int) case 0x000099: cs_str = "TLS/DHE-DSS/SEED-CBC/SHA"; break; case 0x00009A: cs_str = "TLS/DHE-RSA/SEED-CBC/SHA"; break; case 0x00009B: cs_str = "TLS/DH-ANON/SEED-CBC/SHA"; break; + case 0x00009C: cs_str = "TLS/RSA/AES128-GCM/SHA256"; break; + case 0x00009E: cs_str = "TLS/DHE-RSA/AES128-GCM/SHA256"; break; case 0x0000FF: cs_str = "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"; break; @@ -438,6 +440,7 @@ const char * V2CipherString(int cs_int) case 0x00C02A: cs_str = "TLS/ECDH-RSA/AES256-CBC/SHA384"; break; case 0x00C02B: cs_str = "TLS/ECDHE-ECDSA/AES128-GCM/SHA256"; break; case 0x00C02C: cs_str = "TLS/ECDHE-ECDSA/AES256-GCM/SHA384"; break; + case 0x00C02F: cs_str = "TLS/ECDHE-RSA/AES128-GCM/SHA256"; break; case 0x00FEFF: cs_str = "SSL3/RSA-FIPS/3DESEDE-CBC/SHA"; break; case 0x00FEFE: cs_str = "SSL3/RSA-FIPS/DES-CBC/SHA"; break; |