Revert of purge nss files and dependencies

webrtc/base/sslidentity_unittest.cc

 /*
  *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 167 matching lines @@
   rtc::scoped_ptr<SSLIdentity> identity_ecdsa1_;
   rtc::scoped_ptr<SSLIdentity> identity_ecdsa2_;
   rtc::scoped_ptr<rtc::SSLCertificate> test_cert_;
 };
 
 TEST_F(SSLIdentityTest, FixedDigestSHA1) {
   TestDigestForFixedCert(rtc::DIGEST_SHA_1, 20, kTestCertSha1);
 }
 
 // HASH_AlgSHA224 is not supported in the chromium linux build.
+#if SSL_USE_NSS
+TEST_F(SSLIdentityTest, DISABLED_FixedDigestSHA224) {
+#else
 TEST_F(SSLIdentityTest, FixedDigestSHA224) {
+#endif
   TestDigestForFixedCert(rtc::DIGEST_SHA_224, 28, kTestCertSha224);
 }
 
 TEST_F(SSLIdentityTest, FixedDigestSHA256) {
   TestDigestForFixedCert(rtc::DIGEST_SHA_256, 32, kTestCertSha256);
 }
 
 TEST_F(SSLIdentityTest, FixedDigestSHA384) {
   TestDigestForFixedCert(rtc::DIGEST_SHA_384, 48, kTestCertSha384);
 }
 
 TEST_F(SSLIdentityTest, FixedDigestSHA512) {
   TestDigestForFixedCert(rtc::DIGEST_SHA_512, 64, kTestCertSha512);
 }
 
 // HASH_AlgSHA224 is not supported in the chromium linux build.
+#if SSL_USE_NSS
+TEST_F(SSLIdentityTest, DISABLED_DigestSHA224) {
+#else
 TEST_F(SSLIdentityTest, DigestSHA224) {
+#endif
   TestDigestForGeneratedCert(rtc::DIGEST_SHA_224, 28);
 }
 
 TEST_F(SSLIdentityTest, DigestSHA256) {
   TestDigestForGeneratedCert(rtc::DIGEST_SHA_256, 32);
 }
 
 TEST_F(SSLIdentityTest, DigestSHA384) {
   TestDigestForGeneratedCert(rtc::DIGEST_SHA_384, 48);
 }
@@ skipping 33 matching lines @@
       "LJE/mGw3MyFHEqi81jh95J+ypl6xKW6Rm8jKLR87gUvCaVYn/Z4/P3AqcQTB7wOv\n"
       "UD0A8qfhfDM+LK6rPAnCsVN0NRDY3jvd6rzix9M=\n"
       "-----END CERTIFICATE-----\n";
 
   rtc::scoped_ptr<SSLIdentity> identity(
       SSLIdentity::FromPEMStrings(kRSA_PRIVATE_KEY_PEM, kCERT_PEM));
   EXPECT_TRUE(identity);
   EXPECT_EQ(kCERT_PEM, identity->certificate().ToPEMString());
 }
 
+#if SSL_USE_OPENSSL
+// This will not work on NSS as PK11_ImportDERPrivateKeyInfoAndReturnKey is not
+// ready for EC keys.  Furthermore, NSSIdentity::FromPEMStrings is currently
+// hardwired for RSA (the header matching via kPemTypeRsaPrivateKey needs
+// trivial generalization).
 TEST_F(SSLIdentityTest, FromPEMStringsEC) {
   static const char kRSA_PRIVATE_KEY_PEM[] =
       "-----BEGIN EC PRIVATE KEY-----\n"
       "MHcCAQEEIKkIztWLPbs4Y2zWv7VW2Ov4is2ifleCuPgRB8fRv3IkoAoGCCqGSM49\n"
       "AwEHoUQDQgAEDPV33NrhSdhg9cBRkUWUXnVMXc3h17i9ARbSmNgminKcBXb8/y8L\n"
       "A76cMWQPPM0ybHO8OS7ZVg2U/m+TwE1M2g==\n"
       "-----END EC PRIVATE KEY-----\n";
   static const char kCERT_PEM[] =
       "-----BEGIN CERTIFICATE-----\n"
       "MIIB0jCCAXmgAwIBAgIJAMCjpFt9t6LMMAoGCCqGSM49BAMCMEUxCzAJBgNVBAYT\n"
       "AkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRn\n"
       "aXRzIFB0eSBMdGQwIBcNMTUwNjMwMTMwMTIyWhgPMjI4OTA0MTMxMzAxMjJaMEUx\n"
       "CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl\n"
       "cm5ldCBXaWRnaXRzIFB0eSBMdGQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQM\n"
       "9Xfc2uFJ2GD1wFGRRZRedUxdzeHXuL0BFtKY2CaKcpwFdvz/LwsDvpwxZA88zTJs\n"
       "c7w5LtlWDZT+b5PATUzao1AwTjAdBgNVHQ4EFgQUYHq6nxNNIE832ZmaHc/noODO\n"
       "rtAwHwYDVR0jBBgwFoAUYHq6nxNNIE832ZmaHc/noODOrtAwDAYDVR0TBAUwAwEB\n"
       "/zAKBggqhkjOPQQDAgNHADBEAiAQRojsTyZG0BlKoU7gOt5h+yAMLl2cxmDtOIQr\n"
       "GWP/PwIgJynB4AUDsPT0DWmethOXYijB5sY5UPd9DvgmiS/Mr6s=\n"
       "-----END CERTIFICATE-----\n";
 
   rtc::scoped_ptr<SSLIdentity> identity(
       SSLIdentity::FromPEMStrings(kRSA_PRIVATE_KEY_PEM, kCERT_PEM));
   EXPECT_TRUE(identity);
   EXPECT_EQ(kCERT_PEM, identity->certificate().ToPEMString());
 }
+#endif
 
 TEST_F(SSLIdentityTest, PemDerConversion) {
   std::string der;
   EXPECT_TRUE(SSLIdentity::PemToDer("CERTIFICATE", kTestCertificate, &der));
 
   EXPECT_EQ(kTestCertificate, SSLIdentity::DerToPem(
       "CERTIFICATE",
       reinterpret_cast<const unsigned char*>(der.data()), der.length()));
 }
 
 TEST_F(SSLIdentityTest, GetSignatureDigestAlgorithm) {
   TestGetSignatureDigestAlgorithm();
 }