corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1250568 - Adding ECDHE_PSK suites, r=keeler

Browse Source 
MozReview-Commit-ID: 1MGB7ewpDuZ
This commit is contained in:
Martin Thomson
2016-04-04 16:21:19 -03:00
parent 1c2865030b
commit 15e36308f5
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
security/manager/ssl/nsNSSCallbacks.cpp
View File

@@ -1064,6 +1064,8 @@ AccumulateCipherSuite(Telemetry::ID probe, const SSLChannelInfo& channelInfo)
case TLS_RSA_WITH_SEED_CBC_SHA: value = 67; break;
case TLS_RSA_WITH_RC4_128_SHA: value = 68; break;
case TLS_RSA_WITH_RC4_128_MD5: value = 69; break;
// TLS 1.3 PSK resumption
case TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256: value = 70; break;
// unknown
default:
value = 0;

3
security/manager/ssl/nsNSSComponent.cpp
View File

@@ -1095,6 +1095,9 @@ static const CipherPref sCipherPrefs[] = {
{ "security.ssl3.dhe_rsa_aes_256_sha",
TLS_DHE_RSA_WITH_AES_256_CBC_SHA, true },
{ "security.ssl3.ecdhe_psk_aes_128_gcm_sha256",
TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256, true },
{ "security.ssl3.ecdhe_rsa_rc4_128_sha",
TLS_ECDHE_RSA_WITH_RC4_128_SHA, true, true }, // deprecated (RC4)
{ "security.ssl3.ecdhe_ecdsa_rc4_128_sha",