Relax the failure mode of EncryptorTest.UnsupportedKeySize so that we

Relax the failure mode of EncryptorTest.UnsupportedKeySize so that we
can run the test on all platforms.

R=davidben@chromium.org,joth@chromium.org,rsleevi@chromium.org
BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=286667

[wtc, 2014-07-30 19:04:35]

Please review. Joth added this unit test in
https://codereview.chromium.org/4777001/.

This test now fails on Linux with use_openssl=1 because of the check newly added
in https://codereview.chromium.org/420883003:

// static
SymmetricKey* SymmetricKey::Import(Algorithm algorithm,
                                   const std::string& raw_key) {
  if (algorithm == AES) {
    // Whitelist supported key sizes to avoid accidentaly relying on
    // algorithms available in NSS but not BoringSSL and vice
    // versa. Note that BoringSSL does not support AES-192.
    if (raw_key.size() != 128/8 && raw_key.size() != 256/8)
      return NULL;
  }

Rather than disabling the unit test for defined(USE_OPENSSL) (which would mean
the test is disabled on all platforms), I came up with this solution.

[davidben, 2014-07-30 19:07:13]

lgtm

[wtc, 2014-07-30 19:09:42]

The CQ bit was checked by wtc@chromium.org

[commit-bot: I haz the power, 2014-07-30 19:11:14]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/wtc@chromium.org/432443003/1

[commit-bot: I haz the power, 2014-07-30 21:02:48]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)
  mac_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/35469)
  win_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu/builds/40500)
  android_clang_dbg on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_clang_d...)
  android_dbg on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg/bui...)
  linux_chromium_rel_swarming on tryserver.chromium.linux
(http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  ios_dbg_simulator on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device/bu...)
  ios_rel_device_ninja on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)
  mac_chromium_compile_dbg on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_rel on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel/...)
  win_chromium_rel on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel/...)
  win_chromium_x64_rel on tryserver.chromium.win
(http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)

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

https://codereview.chromium.org/432443003/diff/1/crypto/encryptor_unittest.cc
File crypto/encryptor_unittest.cc (right):

https://codereview.chromium.org/432443003/diff/1/crypto/encryptor_unittest.cc...
crypto/encryptor_unittest.cc:466: if (!sym_key.get())

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.

[commit-bot: I haz the power, 2014-07-31 01:03:10]

Change committed as 286667

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

https://codereview.chromium.org/432443003/diff/1/crypto/encryptor_unittest.cc
File crypto/encryptor_unittest.cc (right):

https://codereview.chromium.org/432443003/diff/1/crypto/encryptor_unittest.cc...
crypto/encryptor_unittest.cc:466: if (!sym_key.get())
On 2014/07/30 22:33:12, wtc wrote:
> 
> 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.

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