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

Unified Diff: base/crypto/encryptor_unittest.cc

Issue 1347002: Add Mac implementations of new SymmetricKey and Encryptor classes. (Closed)
Patch Set: Responding to feedback Created 10 years, 9 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
Index: base/crypto/encryptor_unittest.cc
diff --git a/base/crypto/encryptor_unittest.cc b/base/crypto/encryptor_unittest.cc
index c183d90006dd5db43728d11fcf14f6fda9a956b2..218c7ba04ccc3e0d5cb352d5b5eeaccd67a87ca0 100644
--- a/base/crypto/encryptor_unittest.cc
+++ b/base/crypto/encryptor_unittest.cc
@@ -11,7 +11,7 @@
#include "base/string_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#if defined(USE_NSS)
+#if defined(USE_NSS) || defined(OS_MACOSX)
#define MAYBE(name) name
#else
#define MAYBE(name) DISABLED_ ## name
@@ -19,7 +19,7 @@
TEST(EncryptorTest, MAYBE(EncryptDecrypt)) {
scoped_ptr<base::SymmetricKey> key(base::SymmetricKey::DeriveKeyFromPassword(
- base::SymmetricKey::AES, "password", "salt", 1000, 32));
+ base::SymmetricKey::AES, "password", "saltiest", 1000, 256));
EXPECT_TRUE(NULL != key.get());
base::Encryptor encryptor;

Powered by Google App Engine
This is Rietveld 408576698