[refactor] Misc post-NSS WebCrypto cleanups.

components/webcrypto/algorithms/rsa_pss_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/webcrypto/algorithm_dispatch.h"
 #include "components/webcrypto/algorithms/test_helpers.h"
 #include "components/webcrypto/crypto_data.h"
 #include "components/webcrypto/jwk.h"
 #include "components/webcrypto/status.h"
 #include "components/webcrypto/webcrypto_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
 #include "third_party/WebKit/public/platform/WebCryptoKey.h"
 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
 
 namespace webcrypto {
 
 namespace {
 
-bool SupportsRsaPss() {
-#if defined(USE_OPENSSL)
-  return true;
-#else
-  return false;
-#endif
-}
-
 blink::WebCryptoAlgorithm CreateRsaPssAlgorithm(
     unsigned int salt_length_bytes) {
   return blink::WebCryptoAlgorithm::adoptParamsAndCreate(
       blink::WebCryptoAlgorithmIdRsaPss,
       new blink::WebCryptoRsaPssParams(salt_length_bytes));
 }
 
 class WebCryptoRsaPssTest : public WebCryptoTestBase {};
 
 // Test that no two RSA-PSS signatures are identical, when using a non-zero
 // lengthed salt.
 TEST_F(WebCryptoRsaPssTest, SignIsRandom) {
-  if (!SupportsRsaPss()) {
-    LOG(WARNING) << "Skipping test because RSA-PSS is not supported";
-    return;
-  }
-
   // Import public/private key pair.
   blink::WebCryptoKey public_key = blink::WebCryptoKey::createNull();
   blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull();
 
   ImportRsaKeyPair(
       HexStringToBytes(kPublicKeySpkiDerHex),
       HexStringToBytes(kPrivateKeyPkcs8DerHex),
       CreateRsaHashedImportAlgorithm(blink::WebCryptoAlgorithmIdRsaPss,
                                      blink::WebCryptoAlgorithmIdSha1),
       true, blink::WebCryptoKeyUsageVerify, blink::WebCryptoKeyUsageSign,
@@ skipping 33 matching lines @@
   // Corrupt the signature and verification must fail.
   ASSERT_EQ(Status::Success(),
             Verify(params, public_key, CryptoData(Corrupted(signature2)),
                    CryptoData(message), &is_match));
   EXPECT_FALSE(is_match);
 }
 
 // Try signing and verifying when the salt length is 0. The signature in this
 // case is not random.
 TEST_F(WebCryptoRsaPssTest, SignVerifyNoSalt) {
-  if (!SupportsRsaPss()) {
-    LOG(WARNING) << "Skipping test because RSA-PSS is not supported";
-    return;
-  }
-
   // Import public/private key pair.
   blink::WebCryptoKey public_key = blink::WebCryptoKey::createNull();
   blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull();
 
   ImportRsaKeyPair(
       HexStringToBytes(kPublicKeySpkiDerHex),
       HexStringToBytes(kPrivateKeyPkcs8DerHex),
       CreateRsaHashedImportAlgorithm(blink::WebCryptoAlgorithmIdRsaPss,
                                      blink::WebCryptoAlgorithmIdSha1),
       true, blink::WebCryptoKeyUsageVerify, blink::WebCryptoKeyUsageSign,
@@ skipping 25 matching lines @@
   EXPECT_TRUE(is_match);
 
   // Corrupt the signature and verification must fail.
   ASSERT_EQ(Status::Success(),
             Verify(params, public_key, CryptoData(Corrupted(signature2)),
                    CryptoData(message), &is_match));
   EXPECT_FALSE(is_match);
 }
 
 TEST_F(WebCryptoRsaPssTest, SignEmptyMessage) {
-  if (!SupportsRsaPss()) {
-    LOG(WARNING) << "Skipping test because RSA-PSS is not supported";
-    return;
-  }
-
   // Import public/private key pair.
   blink::WebCryptoKey public_key = blink::WebCryptoKey::createNull();
   blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull();
 
   ImportRsaKeyPair(
       HexStringToBytes(kPublicKeySpkiDerHex),
       HexStringToBytes(kPrivateKeyPkcs8DerHex),
       CreateRsaHashedImportAlgorithm(blink::WebCryptoAlgorithmIdRsaPss,
                                      blink::WebCryptoAlgorithmIdSha1),
       true, blink::WebCryptoKeyUsageVerify, blink::WebCryptoKeyUsageSign,
@@ skipping 17 matching lines @@
             Verify(params, public_key, CryptoData(Corrupted(signature)),
                    CryptoData(message), &is_match));
   EXPECT_FALSE(is_match);
 }
 
 // Iterate through known answers and test verification.
 //   * Verify over original message should succeed
 //   * Verify over corrupted message should fail
 //   * Verification with corrupted signature should fail
 TEST_F(WebCryptoRsaPssTest, VerifyKnownAnswer) {
-  if (!SupportsRsaPss()) {
-    LOG(WARNING) << "Skipping test because RSA-PSS is not supported";
-    return;
-  }
-
   scoped_ptr<base::DictionaryValue> test_data;
   ASSERT_TRUE(ReadJsonTestFileToDictionary("rsa_pss.json", &test_data));
 
   const base::DictionaryValue* keys_dict = NULL;
   ASSERT_TRUE(test_data->GetDictionary("keys", &keys_dict));
 
   const base::ListValue* tests = NULL;
   ASSERT_TRUE(test_data->GetList("tests", &tests));
 
   for (size_t test_index = 0; test_index < tests->GetSize(); ++test_index) {
@@ skipping 43 matching lines @@
               Verify(CreateRsaPssAlgorithm(saltLength), public_key,
                      CryptoData(Corrupted(signature)), CryptoData(message),
                      &is_match));
     EXPECT_FALSE(is_match);
   }
 }
 
 }  // namespace
 
 }  // namespace webcrypto