diff options
| author | EKR <ekr@rtfm.com> | 2016-04-16 16:30:05 -0700 |
|---|---|---|
| committer | EKR <ekr@rtfm.com> | 2016-04-16 16:30:05 -0700 |
| commit | 7a328d75aeea4b8c2f209938474a0ecf7b72a78f (patch) | |
| tree | b4f82bea298a82ccfb07f2cc308dd5c2a335ec9c | |
| parent | 08125395aa312123d222ab1cf77efb52d1daa0ff (diff) | |
| download | nss-hg-7a328d75aeea4b8c2f209938474a0ecf7b72a78f.tar.gz | |
Bug 1265196. Disable ChaCha20/Poly1305 for TLS < 1.2. r=mt
| -rw-r--r-- | lib/ssl/ssl3con.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c index 2635ac18b..5188f3316 100644 --- a/lib/ssl/ssl3con.c +++ b/lib/ssl/ssl3con.c @@ -732,6 +732,9 @@ ssl3_CipherSuiteAllowedForVersionRange( case TLS_DHE_DSS_WITH_AES_256_CBC_SHA256: case TLS_RSA_WITH_NULL_SHA256: case TLS_DHE_DSS_WITH_AES_128_GCM_SHA256: + case TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256: + case TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256: + case TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256: return vrange->max == SSL_LIBRARY_VERSION_TLS_1_2; case TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: |