Revert of Don't use RSAPrivateKey in NSS integration code.

crypto/BUILD.gn

 # Copyright (c) 2013 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.
 
 import("//build/config/crypto.gni")
 import("//testing/test.gni")
 
 component("crypto") {
   output_name = "crcrypto"  # Avoid colliding with OpenSSL's libcrypto.
   sources = [
@@ skipping 32 matching lines @@
     "hmac_openssl.cc",
     "mac_security_services_lock.cc",
     "mac_security_services_lock.h",
 
     # TODO(brettw) these mocks should be moved to a test_support_crypto target
     # if possible.
     "mock_apple_keychain.cc",
     "mock_apple_keychain.h",
     "mock_apple_keychain_ios.cc",
     "mock_apple_keychain_mac.cc",
-    "nss_key_util.cc",
-    "nss_key_util.h",
     "nss_util.cc",
     "nss_util.h",
     "nss_util_internal.h",
     "openssl_bio_string.cc",
     "openssl_bio_string.h",
     "openssl_util.cc",
     "openssl_util.h",
     "p224.cc",
     "p224.h",
     "p224_spake.cc",
@@ skipping 101 matching lines @@
       "openssl_util.cc",
       "openssl_util.h",
       "rsa_private_key_openssl.cc",
       "secure_hash_openssl.cc",
       "signature_creator_openssl.cc",
       "signature_verifier_openssl.cc",
       "symmetric_key_openssl.cc",
     ]
   }
 
-  # Some files are built when NSS is used at all, either for the internal crypto
-  # library or the platform certificate library.
+  # Remove nss_util when NSS is used for neither the internal crypto library
+  # nor the platform certificate library.
   if (use_openssl && !use_nss_certs) {
     sources -= [
-      "nss_key_util.cc",
-      "nss_key_util.h",
       "nss_util.cc",
       "nss_util.h",
       "nss_util_internal.h",
     ]
   }
 
   defines = [ "CRYPTO_IMPLEMENTATION" ]
 }
 
 # TODO(GYP): TODO(dpranke), fix the compile errors for this stuff
@@ skipping 31 matching lines @@
 test("crypto_unittests") {
   sources = [
     # Tests.
     "curve25519_unittest.cc",
     "ec_private_key_unittest.cc",
     "ec_signature_creator_unittest.cc",
     "encryptor_unittest.cc",
     "ghash_unittest.cc",
     "hkdf_unittest.cc",
     "hmac_unittest.cc",
-    "nss_key_util_unittest.cc",
     "nss_util_unittest.cc",
     "openssl_bio_string_unittest.cc",
     "p224_spake_unittest.cc",
     "p224_unittest.cc",
     "random_unittest.cc",
+    "rsa_private_key_nss_unittest.cc",
     "rsa_private_key_unittest.cc",
     "secure_hash_unittest.cc",
     "sha2_unittest.cc",
     "signature_creator_unittest.cc",
     "signature_verifier_unittest.cc",
     "symmetric_key_unittest.cc",
   ]
 
-  # Some files are built when NSS is used at all, either for the internal crypto
-  # library or the platform certificate library.
+  # Remove nss_util when NSS is used for neither the internal crypto library
+  # nor the platform certificate library.
   if (use_openssl && !use_nss_certs) {
-    sources -= [
-      "nss_key_util_unittest.cc",
-      "nss_util_unittest.cc",
-    ]
+    sources -= [ "nss_util_unittest.cc" ]
   }
 
-  if (!use_openssl) {
+  if (use_openssl) {
+    sources -= [ "rsa_private_key_nss_unittest.cc" ]
+  } else {
     sources -= [ "openssl_bio_string_unittest.cc" ]
   }
 
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   deps = [
     ":crypto",
     ":platform",
     ":test_support",
     "//base",
@@ skipping 78 matching lines @@
       public_configs += [ "//third_party/nss:system_nss_no_ssl_config" ]
     } else {
       # Non-Linux platforms use the hermetic NSS from the tree.
       deps += [
         "//third_party/nss:nspr",
         "//third_party/nss:nss",
       ]
     }
   }
 }