diff options
| author | Kai Engert <kaie@kuix.de> | 2016-02-25 19:26:30 +0100 |
|---|---|---|
| committer | Kai Engert <kaie@kuix.de> | 2016-02-25 19:26:30 +0100 |
| commit | 91c07edf7016dbb5652219c5eca9422da5d86c52 (patch) | |
| tree | 524243c14c6c62f30fdebd4b763b3dbe2fa34b9f | |
| parent | ee43c3206fb6648641524862bd205fec5101b293 (diff) | |
| download | nss-hg-91c07edf7016dbb5652219c5eca9422da5d86c52.tar.gz | |
Bug 1126830, backed out e7feee58d6e2, because it doesn't work with firefox, r=franziskusNSS_3_23_BETA8
| -rw-r--r-- | lib/ssl/ssl3con.c | 11 | ||||
| -rw-r--r-- | lib/ssl/sslenum.c | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/lib/ssl/ssl3con.c b/lib/ssl/ssl3con.c index aa9fef507..c3698f3c2 100644 --- a/lib/ssl/ssl3con.c +++ b/lib/ssl/ssl3con.c @@ -95,16 +95,10 @@ static ssl3CipherSuiteCfg cipherSuites[ssl_V3_SUITES_IMPLEMENTED] = { /* cipher_suite policy enabled isPresent */ #ifndef NSS_DISABLE_ECC -#ifdef __arm__ - { TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, SSL_ALLOWED, PR_TRUE, PR_FALSE}, - { TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, SSL_ALLOWED, PR_TRUE, PR_FALSE}, -#endif /* __arm__ */ { TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, SSL_ALLOWED, PR_TRUE, PR_FALSE}, { TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, SSL_ALLOWED, PR_TRUE, PR_FALSE}, -#ifndef __arm__ { TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, SSL_ALLOWED, PR_TRUE, PR_FALSE}, { TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, SSL_ALLOWED, PR_TRUE, PR_FALSE}, -#endif /* __arm__ */ /* TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA is out of order to work around * bug 946147. */ @@ -120,13 +114,8 @@ static ssl3CipherSuiteCfg cipherSuites[ssl_V3_SUITES_IMPLEMENTED] = { { TLS_ECDHE_RSA_WITH_RC4_128_SHA, SSL_ALLOWED, PR_FALSE, PR_FALSE}, #endif /* NSS_DISABLE_ECC */ -#ifdef __arm__ - { TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,SSL_ALLOWED,PR_TRUE, PR_FALSE}, -#endif /* __arm__ */ { TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, SSL_ALLOWED, PR_TRUE, PR_FALSE}, -#ifndef __arm__ { TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,SSL_ALLOWED,PR_TRUE, PR_FALSE}, -#endif /* __arm__ */ { TLS_DHE_DSS_WITH_AES_128_GCM_SHA256, SSL_ALLOWED, PR_FALSE, PR_FALSE}, { TLS_DHE_RSA_WITH_AES_128_CBC_SHA, SSL_ALLOWED, PR_TRUE, PR_FALSE}, { TLS_DHE_DSS_WITH_AES_128_CBC_SHA, SSL_ALLOWED, PR_TRUE, PR_FALSE}, diff --git a/lib/ssl/sslenum.c b/lib/ssl/sslenum.c index a2dd57261..d362b74ee 100644 --- a/lib/ssl/sslenum.c +++ b/lib/ssl/sslenum.c @@ -48,16 +48,10 @@ */ const PRUint16 SSL_ImplementedCiphers[] = { #ifndef NSS_DISABLE_ECC -#ifdef __arm__ - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, -#endif /* __arm__ */ TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, -#ifndef __arm__ TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, -#endif /* __arm__ */ /* TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA must appear before * TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA to work around bug 946147. */ @@ -73,13 +67,8 @@ const PRUint16 SSL_ImplementedCiphers[] = { TLS_ECDHE_RSA_WITH_RC4_128_SHA, #endif /* NSS_DISABLE_ECC */ -#ifdef __arm__ - TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256, -#endif /* __arm__ */ TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, -#ifndef __arm__ TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256, -#endif /* __arm__ */ TLS_DHE_DSS_WITH_AES_128_GCM_SHA256, TLS_DHE_RSA_WITH_AES_128_CBC_SHA, TLS_DHE_DSS_WITH_AES_128_CBC_SHA, |