summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2017-07-20 14:11:42 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-02-02 19:04:33 +0100
commit108b388a68de0ba30eeaa27395166998bdc4ffa7 (patch)
treea0319c4fd7a54b74c74dab7cf257fdf18ee8f2ff /security
parent1852c4834b4a12fff9c147e5f3ecfb2620430367 (diff)
downloaduxp-108b388a68de0ba30eeaa27395166998bdc4ffa7.tar.gz
Add Camellia to the active cipher suites.
Issue mcp-graveyard/UXP#4 point 1. Camellia is a strong, modern, safe cipher with no known weaknesses or reduced strength attacks. The cipher has been approved for use by the ISO/IEC, the European Union's NESSIE project and the Japanese CRYPTREC project.
Diffstat (limited to 'security')
-rw-r--r--security/manager/ssl/nsNSSComponent.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp
index d53f846edf..b46e69cbc7 100644
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -1347,9 +1347,13 @@ static const CipherPref sCipherPrefs[] = {
{ "security.ssl3.dhe_rsa_aes_128_sha",
TLS_DHE_RSA_WITH_AES_128_CBC_SHA, true },
+ { "security.ssl3.dhe_rsa_camellia_256_sha",
+ TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA, true},
{ "security.ssl3.dhe_rsa_aes_256_sha",
TLS_DHE_RSA_WITH_AES_256_CBC_SHA, true },
+ { "security.ssl3.dhe_rsa_camellia_128_sha",
+ TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, true },
{ "security.tls13.aes_128_gcm_sha256",
TLS_AES_128_GCM_SHA256, true },
{ "security.tls13.chacha20_poly1305_sha256",
@@ -1357,6 +1361,10 @@ static const CipherPref sCipherPrefs[] = {
{ "security.tls13.aes_256_gcm_sha384",
TLS_AES_256_GCM_SHA384, true },
+ {"security.ssl3.rsa_camellia_128_sha",
+ TLS_RSA_WITH_CAMELLIA_128_CBC_SHA, true },
+ {"security.ssl3.rsa_camellia_256_sha",
+ TLS_RSA_WITH_CAMELLIA_256_CBC_SHA, true },
{ "security.ssl3.rsa_aes_128_sha",
TLS_RSA_WITH_AES_128_CBC_SHA, true }, // deprecated (RSA key exchange)
{ "security.ssl3.rsa_aes_256_sha",