Bug 1396463 - add ssl_sig_rsa_pkcs1_sha1 case to getSignatureName, r=bustage
authorFranziskus Kiefer <franziskuskiefer@gmail.com>
Mon, 04 Sep 2017 10:57:38 +0200
changeset 378837 ac433313dbd2
parent 378836 90691dd0694f
child 378838 ecd4dfc78f59
push id32443
push userarchaeopteryx@coole-files.de
push dateTue, 05 Sep 2017 09:41:20 +0000
treeherdermozilla-central@3ecda4678c49 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1396463
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 1396463 - add ssl_sig_rsa_pkcs1_sha1 case to getSignatureName, r=bustage MozReview-Commit-ID: 814ZXGoesQz
security/manager/ssl/nsNSSCallbacks.cpp
--- a/security/manager/ssl/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/nsNSSCallbacks.cpp
@@ -865,16 +865,19 @@ getKeaGroupName(uint32_t aKeaGroup)
 static nsCString
 getSignatureName(uint32_t aSignatureScheme)
 {
   nsCString signatureName;
   switch (aSignatureScheme) {
     case ssl_sig_none:
       signatureName = NS_LITERAL_CSTRING("none");
       break;
+    case ssl_sig_rsa_pkcs1_sha1:
+      signatureName = NS_LITERAL_CSTRING("RSA-PKCS1-SHA1");
+      break;
     case ssl_sig_rsa_pkcs1_sha256:
       signatureName = NS_LITERAL_CSTRING("RSA-PKCS1-SHA256");
       break;
     case ssl_sig_rsa_pkcs1_sha384:
       signatureName = NS_LITERAL_CSTRING("RSA-PKCS1-SHA384");
       break;
     case  ssl_sig_rsa_pkcs1_sha512:
       signatureName = NS_LITERAL_CSTRING("RSA-PKCS1-SHA512");
@@ -895,19 +898,16 @@ getSignatureName(uint32_t aSignatureSche
       signatureName = NS_LITERAL_CSTRING("RSA-PSS-SHA384");
       break;
     case ssl_sig_rsa_pss_sha512:
       signatureName = NS_LITERAL_CSTRING("RSA-PSS-SHA512");
       break;
     case ssl_sig_ecdsa_sha1:
       signatureName = NS_LITERAL_CSTRING("ECDSA-SHA1");
       break;
-    case ssl_sig_rsa_pkcs1_sha1md5:
-      signatureName = NS_LITERAL_CSTRING("RSA-PKCS1-SHA1MD5");
-      break;
     // All other groups are not enabled in Firefox. See sEnabledSignatureSchemes
     // in nsNSSIOLayer.cpp.
     default:
       // This really shouldn't happen!
       MOZ_ASSERT_UNREACHABLE("Invalid signature scheme.");
       signatureName = NS_LITERAL_CSTRING("unknown signature");
   }
   return signatureName;