summaryrefslogtreecommitdiffstats
path: root/base/crypto/encryptor_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'base/crypto/encryptor_unittest.cc')
-rw-r--r--base/crypto/encryptor_unittest.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/base/crypto/encryptor_unittest.cc b/base/crypto/encryptor_unittest.cc
index a4f4afd..c5967fa 100644
--- a/base/crypto/encryptor_unittest.cc
+++ b/base/crypto/encryptor_unittest.cc
@@ -39,9 +39,8 @@ TEST(EncryptorTest, EncryptDecrypt) {
// http://gladman.plushost.co.uk/oldsite/AES/index.php
// http://csrc.nist.gov/groups/STM/cavp/documents/aes/KAT_AES.zip
-// TODO(wtc): implement base::SymmetricKey::Import and enable this test for
-// other platforms.
-#if defined(OS_WIN)
+// TODO(wtc): implement base::SymmetricKey::Import and enable this test on Mac.
+#if defined(USE_NSS) || defined(OS_WIN)
// NIST SP 800-38A test vector F.2.5 CBC-AES256.Encrypt.
TEST(EncryptorTest, EncryptAES256CBC) {
// From NIST SP 800-38a test cast F.2.5 CBC-AES256.Encrypt.
@@ -88,7 +87,7 @@ TEST(EncryptorTest, EncryptAES256CBC) {
};
scoped_ptr<base::SymmetricKey> key(base::SymmetricKey::Import(
- base::SymmetricKey::AES, raw_key, sizeof(raw_key)));
+ base::SymmetricKey::AES, reinterpret_cast<const char*>(raw_key)));
EXPECT_TRUE(NULL != key.get());
base::Encryptor encryptor;
@@ -110,4 +109,4 @@ TEST(EncryptorTest, EncryptAES256CBC) {
EXPECT_EQ(plaintext, decypted);
}
-#endif // OS_WIN
+#endif // USE_NSS || OS_WIN