diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2016-02-11 08:42:47 +0100 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2016-02-11 08:42:47 +0100 |
| commit | 81b51a48e5dcdaf0bd1c23e3525f712b2a75b0ec (patch) | |
| tree | a0bfdd404aafd0416fb64fafabefe1e57c0e7da1 /cmd/ssltap | |
| parent | 7a60a8faa4344d7def3edcdc768d06424811be5f (diff) | |
| download | nss-hg-81b51a48e5dcdaf0bd1c23e3525f712b2a75b0ec.tar.gz | |
Bug 1227905 - Support ChaCha20+Poly1305 cipher suites r=mt,wtc,ekr
Diffstat (limited to 'cmd/ssltap')
| -rw-r--r-- | cmd/ssltap/ssltap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/ssltap/ssltap.c b/cmd/ssltap/ssltap.c index 8ea465ef3..29b91910e 100644 --- a/cmd/ssltap/ssltap.c +++ b/cmd/ssltap/ssltap.c @@ -443,6 +443,10 @@ const char * V2CipherString(int cs_int) case 0x00C02C: cs_str = "TLS/ECDHE-ECDSA/AES256-GCM/SHA384"; break; case 0x00C02F: cs_str = "TLS/ECDHE-RSA/AES128-GCM/SHA256"; break; + case 0x00CCA8: cs_str = "TLS/ECDHE-RSA/CHACHA20-POLY1305/SHA256"; break; + case 0x00CCA9: cs_str = "TLS/ECDHE-ECDSA/CHACHA20-POLY1305/SHA256"; break; + case 0x00CCAA: cs_str = "TLS/DHE-RSA/CHACHA20-POLY1305/SHA256"; break; + case 0x00FEFF: cs_str = "SSL3/RSA-FIPS/3DESEDE-CBC/SHA"; break; case 0x00FEFE: cs_str = "SSL3/RSA-FIPS/DES-CBC/SHA"; break; case 0x00FFE1: cs_str = "SSL3/RSA-FIPS/DES56-CBC/SHA"; break; |