Enable Nigori unit tests on all platforms.

BUG=none
TEST=NigoriTest.*

Review URL: http://codereview.chromium.org/1736008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45494 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 9 insertions, 15 deletions

diff --git a/base/crypto/symmetric_key_mac.cc b/base/crypto/symmetric_key_mac.cc
index 504f204..ba033a7 100644
--- a/base/crypto/symmetric_key_mac.cc
+++ b/base/crypto/symmetric_key_mac.cc
@@ -24,7 +24,7 @@ CSSM_KEY_TYPE CheckKeyParams(base::SymmetricKey::Algorithm algorithm,
     return CSSM_ALGID_AES;
   } else {
     CHECK(algorithm == base::SymmetricKey::HMAC_SHA1);
-    CHECK(key_size_in_bits >= 80 && (key_size_in_bits % 8) == 0)
+    CHECK(key_size_in_bits >= 64 && (key_size_in_bits % 8) == 0)
         << "Invalid key size " << key_size_in_bits << " bits";
     return CSSM_ALGID_SHA1HMAC_LEGACY;
   }
diff --git a/chrome/browser/sync/util/nigori.cc b/chrome/browser/sync/util/nigori.cc
index b954418..03e183d 100644
--- a/chrome/browser/sync/util/nigori.cc
+++ b/chrome/browser/sync/util/nigori.cc
@@ -77,7 +77,7 @@ bool Nigori::Init(const std::string& username, const std::string& password) {
       SymmetricKey::HMAC_SHA1, salt_password.str(),
       kSaltSalt,
       kSaltIterations,
-      kSaltKeySize));
+      kSaltKeySizeInBits));
   DCHECK(user_salt.get());
 
   std::string raw_user_salt;
diff --git a/chrome/browser/sync/util/nigori.h b/chrome/browser/sync/util/nigori.h
index 67dc758..b7d037b 100644
--- a/chrome/browser/sync/util/nigori.h
+++ b/chrome/browser/sync/util/nigori.h
@@ -50,7 +50,7 @@ class Nigori {
   bool Decrypt(const std::string& value, std::string* decrypted);
 
   static const char kSaltSalt[];  // The salt used to derive the user salt.
-  static const size_t kSaltKeySize = 8;
+  static const size_t kSaltKeySizeInBits = 64;
   static const size_t kDerivedKeySizeInBits = 128;
   static const size_t kIvSize = 16;
   static const size_t kHashSize = 32;
diff --git a/chrome/browser/sync/util/nigori_unittest.cc b/chrome/browser/sync/util/nigori_unittest.cc
index f01d015..4c6af89 100644
--- a/chrome/browser/sync/util/nigori_unittest.cc
+++ b/chrome/browser/sync/util/nigori_unittest.cc
@@ -10,13 +10,7 @@
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(USE_NSS)
-#define MAYBE(name) name
-#else
-#define MAYBE(name) DISABLED_ ## name
-#endif
-
-TEST(NigoriTest, MAYBE(PermuteIsConstant)) {
+TEST(NigoriTest, PermuteIsConstant) {
   browser_sync::Nigori nigori1("example.com");
   EXPECT_TRUE(nigori1.Init("username", "password"));
 
@@ -37,7 +31,7 @@ TEST(NigoriTest, MAYBE(PermuteIsConstant)) {
   EXPECT_EQ(permuted1, permuted2);
 }
 
-TEST(NigoriTest, MAYBE(EncryptDifferentIv)) {
+TEST(NigoriTest, EncryptDifferentIv) {
   browser_sync::Nigori nigori("example.com");
   EXPECT_TRUE(nigori.Init("username", "password"));
 
@@ -52,7 +46,7 @@ TEST(NigoriTest, MAYBE(EncryptDifferentIv)) {
   EXPECT_NE(encrypted1, encrypted2);
 }
 
-TEST(NigoriTest, MAYBE(EncryptDecrypt)) {
+TEST(NigoriTest, EncryptDecrypt) {
   browser_sync::Nigori nigori("example.com");
   EXPECT_TRUE(nigori.Init("username", "password"));
 
@@ -67,7 +61,7 @@ TEST(NigoriTest, MAYBE(EncryptDecrypt)) {
   EXPECT_EQ(plaintext, decrypted);
 }
 
-TEST(NigoriTest, MAYBE(CorruptedIv)) {
+TEST(NigoriTest, CorruptedIv) {
   browser_sync::Nigori nigori("example.com");
   EXPECT_TRUE(nigori.Init("username", "password"));
 
@@ -85,7 +79,7 @@ TEST(NigoriTest, MAYBE(CorruptedIv)) {
   EXPECT_NE(plaintext, decrypted);
 }
 
-TEST(NigoriTest, MAYBE(CorruptedCiphertext)) {
+TEST(NigoriTest, CorruptedCiphertext) {
   browser_sync::Nigori nigori("example.com");
   EXPECT_TRUE(nigori.Init("username", "password"));
 
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 5d1278b..0b8a775 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -926,6 +926,7 @@
         'browser/sync/sync_setup_wizard_unittest.cc',
         'browser/sync/sync_ui_util_mac_unittest.mm',
         'browser/sync/test_profile_sync_service.h',
+        'browser/sync/util/nigori_unittest.cc',
         'browser/tab_contents/navigation_controller_unittest.cc',
         'browser/tab_contents/navigation_entry_unittest.cc',
         'browser/tab_contents/render_view_host_manager_unittest.cc',
@@ -1686,7 +1687,6 @@
         'browser/sync/util/crypto_helpers_unittest.cc',
         'browser/sync/util/event_sys_unittest.cc',
         'browser/sync/util/extensions_activity_monitor_unittest.cc',
-        'browser/sync/util/nigori_unittest.cc',
         'browser/sync/util/user_settings_unittest.cc',
         'test/file_test_utils.cc',
         'test/sync/engine/mock_gaia_authenticator.cc',