Bug 1397833 - don't assert on custom TLS key-exchange groups, r=keeler
authorFranziskus Kiefer <franziskuskiefer@gmail.com>
Fri, 08 Sep 2017 11:53:11 +0200
changeset 429566 f13d106fc6789dc775808929d263272aaf75975b
parent 429565 227388c78b76409266f0be66bcaeaa4f84229aee
child 429567 1ef55343a4e988b27633479a8a8f8d9dac2a233b
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1397833
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1397833 - don't assert on custom TLS key-exchange groups, r=keeler MozReview-Commit-ID: 8oztPlzw3PB
devtools/client/locales/en-US/netmonitor.properties
devtools/shared/webconsole/network-helper.js
security/manager/ssl/nsNSSCallbacks.cpp
--- a/devtools/client/locales/en-US/netmonitor.properties
+++ b/devtools/client/locales/en-US/netmonitor.properties
@@ -766,16 +766,20 @@ netmonitor.security.cipherSuite=Cipher s
 # in the security tab describing the key exchange group suite used to secure
 # this connection.
 netmonitor.security.keaGroup=Key Exchange Group:
 
 # LOCALIZATION NOTE (netmonitor.security.keaGroup.none): This is the label
 # displayed in the security tab describing the case when no group was used.
 netmonitor.security.keaGroup.none=none
 
+# LOCALIZATION NOTE (netmonitor.security.keaGroup.custom): This is the label
+# displayed in the security tab describing the case when a custom group was used.
+netmonitor.security.keaGroup.custom=custom
+
 # LOCALIZATION NOTE (netmonitor.security.keaGroup.unknown): This is the value
 # displayed in the security tab describing an unknown group.
 netmonitor.security.keaGroup.unknown=unknown group
 
 # LOCALIZATION NOTE (netmonitor.security.signatureScheme): This is the label
 # displayed in the security tab describing the signature scheme used by for
 # the server certificate in this connection.
 netmonitor.security.signatureScheme=Signature Scheme:
--- a/devtools/shared/webconsole/network-helper.js
+++ b/devtools/shared/webconsole/network-helper.js
@@ -623,16 +623,19 @@ var NetworkHelper = {
       info.cipherSuite = SSLStatus.cipherName;
 
       // Key exchange group name.
       info.keaGroupName = SSLStatus.keaGroupName;
       // Localise two special values.
       if (info.keaGroupName == "none") {
         info.keaGroupName = L10N.getStr("netmonitor.security.keaGroup.none");
       }
+      if (info.keaGroupName == "custom") {
+        info.keaGroupName = L10N.getStr("netmonitor.security.keaGroup.custom");
+      }
       if (info.keaGroupName == "unknown group") {
         info.keaGroupName = L10N.getStr("netmonitor.security.keaGroup.unknown");
       }
 
       // Certificate signature scheme.
       info.signatureSchemeName = SSLStatus.signatureSchemeName;
       // Localise two special values.
       if (info.signatureSchemeName == "none") {
--- a/security/manager/ssl/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/nsNSSCallbacks.cpp
@@ -847,16 +847,19 @@ getKeaGroupName(uint32_t aKeaGroup)
       groupName = NS_LITERAL_CSTRING("FF 2048");
       break;
     case ssl_grp_ffdhe_3072:
       groupName = NS_LITERAL_CSTRING("FF 3072");
       break;
     case ssl_grp_none:
       groupName = NS_LITERAL_CSTRING("none");
       break;
+    case ssl_grp_ffdhe_custom:
+      groupName = NS_LITERAL_CSTRING("custom");
+      break;
     // All other groups are not enabled in Firefox. See namedGroups in
     // nsNSSIOLayer.cpp.
     default:
       // This really shouldn't happen!
       MOZ_ASSERT_UNREACHABLE("Invalid key exchange group.");
       groupName = NS_LITERAL_CSTRING("unknown group");
   }
   return groupName;