Index: crypto/symmetric_key_unittest.cc |
diff --git a/crypto/symmetric_key_unittest.cc b/crypto/symmetric_key_unittest.cc |
index 7cd47cd73c196a717e9c7709e7f2dda5e60da882..468759b0423c7680779f7b61e207f3ebb0f97fe2 100644 |
--- a/crypto/symmetric_key_unittest.cc |
+++ b/crypto/symmetric_key_unittest.cc |
@@ -80,15 +80,6 @@ class SymmetricKeyDeriveKeyFromPasswordTest |
TEST_P(SymmetricKeyDeriveKeyFromPasswordTest, DeriveKeyFromPassword) { |
PBKDF2TestVector test_data(GetParam()); |
-#if defined(OS_MACOSX) && !defined(OS_IOS) |
- // The OS X crypto libraries have minimum salt and iteration requirements |
svaldez
2016/06/07 13:56:41
Seems to be separate from the NSS change? Add a no
Ryan Sleevi
2016/06/07 14:58:18
There already was one. The second paragraph.
|
- // so some of the tests below will cause them to barf. Skip these. |
- if (strlen(test_data.salt) < 8 || test_data.rounds < 1000) { |
- VLOG(1) << "Skipped test vector for " << test_data.expected; |
- return; |
- } |
-#endif // OS_MACOSX |
- |
std::unique_ptr<crypto::SymmetricKey> key( |
crypto::SymmetricKey::DeriveKeyFromPassword( |
test_data.algorithm, test_data.password, test_data.salt, |