Upstream minor iOS crypto diffs.

crypto/symmetric_key_unittest.cc

 // Copyright (c) 2011 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/symmetric_key.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
@@ skipping 62 matching lines @@
   unsigned int key_size_in_bits;
   const char* expected;  // ASCII encoded hex bytes
 };
 
 class SymmetricKeyDeriveKeyFromPasswordTest
     : public testing::TestWithParam<PBKDF2TestVector> {
 };
 
 TEST_P(SymmetricKeyDeriveKeyFromPasswordTest, DeriveKeyFromPassword) {
   PBKDF2TestVector test_data(GetParam());
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && !defined(OS_IOS)
   // The OS X crypto libraries have minimum salt and iteration requirements
   // so some of the tests below will cause them to barf. Skip these.
   if (strlen(test_data.salt) < 8 || test_data.rounds < 1000) {
     VLOG(1) << "Skipped test vector for " << test_data.expected;
     return;
   }
 #endif  // OS_MACOSX
 
   scoped_ptr<crypto::SymmetricKey> key(
       crypto::SymmetricKey::DeriveKeyFromPassword(
@@ skipping 122 matching lines @@
     "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
     "pass phrase exceeds block size",
     20,
     256,
     "e0739745dc28b8721ba402e05214d2ac1eab54cf72bee1fba388297a09eb493c",
   },
 };
 
 INSTANTIATE_TEST_CASE_P(, SymmetricKeyDeriveKeyFromPasswordTest,
                         testing::ValuesIn(kTestVectors));