From fcdd8f6f67f6e8456b3e24e7b32e66dd1d3766fa Mon Sep 17 00:00:00 2001 From: Dennis Jackson Date: Fri, 3 Mar 2023 21:43:37 +0000 Subject: Bug 1820175 - Fix various compiler warnings in NSS. r=jschanck. Differential Revision: https://phabricator.services.mozilla.com/D171581 --- gtests/ssl_gtest/tls_subcerts_unittest.cc | 33 ++++++------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) (limited to 'gtests/ssl_gtest') 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(reinterpret_cast(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. -- cgit v1.2.1