Relax the failure mode of EncryptorTest.UnsupportedKeySize so that we

crypto/encryptor_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crypto/encryptor.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 438 matching lines @@
   std::string ciphertext;
   EXPECT_TRUE(encryptor.Encrypt(plaintext, &ciphertext));
   EXPECT_EQ(expected_ciphertext_hex, base::HexEncode(ciphertext.data(),
                                                      ciphertext.size()));
 
   std::string decrypted;
   EXPECT_TRUE(encryptor.Decrypt(ciphertext, &decrypted));
   EXPECT_EQ(plaintext, decrypted);
 }
 
-// Not all platforms allow import/generation of symmetric keys with an
-// unsupported size.
-#if !defined(USE_NSS) && !defined(OS_WIN) && !defined(OS_MACOSX)
+// Symmetric keys with an unsupported size should be rejected. Whether they are
+// rejected by SymmetricKey::Import or Encryptor::Init depends on the platform.
 TEST(EncryptorTest, UnsupportedKeySize) {
   std::string key = "7 = bad";
   std::string iv = "Sweet Sixteen IV";
   scoped_ptr<crypto::SymmetricKey> sym_key(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, key));
-  ASSERT_TRUE(sym_key.get());
+  if (!sym_key.get())

[wtc, 2014/07/30 22:33:12]

David, it just occurred to me that perhaps we should now require that we fail in
SymmetricKey::Import. Do you already have such a test in
symmetric_key_unittest.cc? If so, perhaps we can just delete this test.

[davidben, 2014/07/31 16:12:15]

Hrm, maybe. I didn't add one already. That probably would have been a good idea.
:-)

+    return;
 
   crypto::Encryptor encryptor;
-  // The IV must be exactly as long a the cipher block size.
+  // The IV must be exactly as long as the cipher block size.
   EXPECT_EQ(16U, iv.size());
   EXPECT_FALSE(encryptor.Init(sym_key.get(), crypto::Encryptor::CBC, iv));
 }
-#endif  // unsupported platforms.
 
 TEST(EncryptorTest, UnsupportedIV) {
   std::string key = "128=SixteenBytes";
   std::string iv = "OnlyForteen :(";
   scoped_ptr<crypto::SymmetricKey> sym_key(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, key));
   ASSERT_TRUE(sym_key.get());
 
   crypto::Encryptor encryptor;
   EXPECT_FALSE(encryptor.Init(sym_key.get(), crypto::Encryptor::CBC, iv));
@@ skipping 38 matching lines @@
   //
   // Otherwise when using std::string as the other tests do, accesses several
   // bytes off the end of the buffer may fall inside the reservation of
   // the string and not be detected.
   scoped_ptr<char[]> ciphertext(new char[1]);
 
   std::string plaintext;
   EXPECT_FALSE(
       encryptor.Decrypt(base::StringPiece(ciphertext.get(), 1), &plaintext));
 }