Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(636)

Unified Diff: webrtc/base/sslidentity_unittest.cc

Issue 1313233005: purge nss files and dependencies (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/sslidentity.cc ('k') | webrtc/base/sslstreamadapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/sslidentity_unittest.cc
diff --git a/webrtc/base/sslidentity_unittest.cc b/webrtc/base/sslidentity_unittest.cc
index b49d0d23a79e2597a5490c337d02a5faa0e2f2d7..e8df41506ba90383e9ca89969e75b5b20fe38eeb 100644
--- a/webrtc/base/sslidentity_unittest.cc
+++ b/webrtc/base/sslidentity_unittest.cc
@@ -185,11 +185,7 @@ TEST_F(SSLIdentityTest, FixedDigestSHA1) {
}
// 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);
}
@@ -206,11 +202,7 @@ TEST_F(SSLIdentityTest, FixedDigestSHA512) {
}
// 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);
}
@@ -264,11 +256,6 @@ TEST_F(SSLIdentityTest, FromPEMStringsRSA) {
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"
@@ -295,7 +282,6 @@ TEST_F(SSLIdentityTest, FromPEMStringsEC) {
EXPECT_TRUE(identity);
EXPECT_EQ(kCERT_PEM, identity->certificate().ToPEMString());
}
-#endif
TEST_F(SSLIdentityTest, PemDerConversion) {
std::string der;
« no previous file with comments | « webrtc/base/sslidentity.cc ('k') | webrtc/base/sslstreamadapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698