Bug 1820175 - Fix various compiler warnings in NSS. r=jschanck.

Differential Revision: https://phabricator.services.mozilla.com/D171581

3 files changed, 7 insertions, 29 deletions

diff --git a/gtests/freebl_gtest/ecl_unittest.cc b/gtests/freebl_gtest/ecl_unittest.cc
index ae53284eb..f3f8ddc74 100644
--- a/gtests/freebl_gtest/ecl_unittest.cc
+++ b/gtests/freebl_gtest/ecl_unittest.cc
@@ -14,7 +14,7 @@ namespace nss_test {
 
 class ECLTest : public ::testing::Test {
  protected:
-  const ECCurveName GetCurveName(std::string name) {
+  ECCurveName GetCurveName(std::string name) {
     if (name == "P256") return ECCurve_NIST_P256;
     if (name == "P384") return ECCurve_NIST_P384;
     if (name == "P521") return ECCurve_NIST_P521;
diff --git a/gtests/nss_bogo_shim/nss_bogo_shim.cc b/gtests/nss_bogo_shim/nss_bogo_shim.cc
index 52a3e9a94..133af518b 100644
--- a/gtests/nss_bogo_shim/nss_bogo_shim.cc
+++ b/gtests/nss_bogo_shim/nss_bogo_shim.cc
@@ -502,7 +502,6 @@ class TestAgent {
         return SECFailure;
       }
     }
-    return SECSuccess;
   }
 
   // Write bytes to the other side then read them back and check
diff --git a/gtests/ssl_gtest/tls_subcerts_unittest.cc b/gtests/ssl_gtest/tls_subcerts_unittest.cc
index 77bb41a0b..3bb297ffc 100644
--- a/gtests/ssl_gtest/tls_subcerts_unittest.cc
+++ b/gtests/ssl_gtest/tls_subcerts_unittest.cc
@@ -353,33 +353,12 @@ static void GenerateWeakRsaKey(ScopedSECKEYPrivateKey& priv,
   rsaparams.keySizeInBits = 528;
   rsaparams.pe = 65537;
 
-  // Bug 1012786: PK11_GenerateKeyPair can fail if there is insufficient
-  // entropy to generate a random key. We can fake some.
-  for (int retry = 0; retry < 10; ++retry) {
-    SECKEYPublicKey* p_pub = nullptr;
-    priv.reset(PK11_GenerateKeyPair(slot.get(), CKM_RSA_PKCS_KEY_PAIR_GEN,
-                                    &rsaparams, &p_pub, false, false, nullptr));
-    pub.reset(p_pub);
-    if (priv) {
-      return;
-    }
-
-    ASSERT_FALSE(pub);
-    if (PORT_GetError() != SEC_ERROR_PKCS11_FUNCTION_FAILED) {
-      break;
-    }
-
-    // https://xkcd.com/221/
-    static const uint8_t FRESH_ENTROPY[16] = {4};
-    ASSERT_EQ(
-        SECSuccess,
-        PK11_RandomUpdate(
-            const_cast<void*>(reinterpret_cast<const void*>(FRESH_ENTROPY)),
-            sizeof(FRESH_ENTROPY)));
-    break;
-  }
-  ADD_FAILURE() << "Unable to generate an RSA key: "
-                << PORT_ErrorToName(PORT_GetError());
+  SECKEYPublicKey* p_pub = nullptr;
+  priv.reset(PK11_GenerateKeyPair(slot.get(), CKM_RSA_PKCS_KEY_PAIR_GEN,
+                                  &rsaparams, &p_pub, false, false, nullptr));
+  pub.reset(p_pub);
+  PR_ASSERT(priv);
+  return;
 }
 
 // Fail to connect with a weak RSA key.