diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 16:23:34 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:37:21 +0000 |
commit | 38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch) | |
tree | c4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/crypto | |
parent | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff) | |
download | qtwebengine-chromium-38a9a29f4f9436cace7f0e7abf9c586057df8a4e.tar.gz |
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/crypto')
-rw-r--r-- | chromium/crypto/BUILD.gn | 5 | ||||
-rw-r--r-- | chromium/crypto/ec_private_key_unittest.cc | 4 | ||||
-rw-r--r-- | chromium/crypto/encryptor_unittest.cc | 44 | ||||
-rw-r--r-- | chromium/crypto/hmac_unittest.cc | 8 | ||||
-rw-r--r-- | chromium/crypto/mock_apple_keychain.cc | 4 | ||||
-rw-r--r-- | chromium/crypto/p224_unittest.cc | 4 |
6 files changed, 31 insertions, 38 deletions
diff --git a/chromium/crypto/BUILD.gn b/chromium/crypto/BUILD.gn index b7e91c73c2f..c27c7cf5c4b 100644 --- a/chromium/crypto/BUILD.gn +++ b/chromium/crypto/BUILD.gn @@ -69,9 +69,6 @@ component("crypto") { "symmetric_key.h", ] - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] - deps = [ ":platform", "//base", @@ -154,8 +151,6 @@ test("crypto_unittests") { ] } - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] - deps = [ ":crypto", ":platform", diff --git a/chromium/crypto/ec_private_key_unittest.cc b/chromium/crypto/ec_private_key_unittest.cc index 00aa8a8d218..cfec13ca82d 100644 --- a/chromium/crypto/ec_private_key_unittest.cc +++ b/chromium/crypto/ec_private_key_unittest.cc @@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/macros.h" +#include "base/stl_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -266,7 +266,7 @@ TEST(ECPrivateKeyUnitTest, LoadOpenSSLKeyTest) { std::string raw_public_key; EXPECT_TRUE(keypair_openssl->ExportRawPublicKey(&raw_public_key)); EXPECT_EQ(std::string(reinterpret_cast<const char*>(kOpenSSLRawPublicKey), - arraysize(kOpenSSLRawPublicKey)), + base::size(kOpenSSLRawPublicKey)), raw_public_key); } diff --git a/chromium/crypto/encryptor_unittest.cc b/chromium/crypto/encryptor_unittest.cc index 76178dcb119..0fec305cf2c 100644 --- a/chromium/crypto/encryptor_unittest.cc +++ b/chromium/crypto/encryptor_unittest.cc @@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/macros.h" +#include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "crypto/symmetric_key.h" #include "testing/gtest/include/gtest/gtest.h" @@ -81,7 +81,7 @@ TEST(EncryptorTest, DecryptWrongKey) { 0x48, 0x1D, 0x42, 0xB0, 0xBA, 0x21, 0xB2, 0x0C }; - ASSERT_EQ(arraysize(expected_ciphertext), ciphertext.size()); + ASSERT_EQ(base::size(expected_ciphertext), ciphertext.size()); for (size_t i = 0; i < ciphertext.size(); ++i) { ASSERT_EQ(expected_ciphertext[i], static_cast<unsigned char>(ciphertext[i])); @@ -236,7 +236,7 @@ void TestAESCTRMultipleDecrypt( int kTestDecryptSizes[] = { 32, 16, 8 }; int offset = 0; - for (size_t i = 0; i < arraysize(kTestDecryptSizes); ++i) { + for (size_t i = 0; i < base::size(kTestDecryptSizes); ++i) { std::string decrypted; size_t len = kTestDecryptSizes[i]; EXPECT_TRUE( @@ -250,35 +250,33 @@ void TestAESCTRMultipleDecrypt( } // namespace TEST(EncryptorTest, EncryptAES128CTR) { - TestAESCTREncrypt( - kAES128CTRKey, arraysize(kAES128CTRKey), - kAESCTRInitCounter, arraysize(kAESCTRInitCounter), - kAESCTRPlaintext, arraysize(kAESCTRPlaintext), - kAES128CTRCiphertext, arraysize(kAES128CTRCiphertext)); + TestAESCTREncrypt(kAES128CTRKey, base::size(kAES128CTRKey), + kAESCTRInitCounter, base::size(kAESCTRInitCounter), + kAESCTRPlaintext, base::size(kAESCTRPlaintext), + kAES128CTRCiphertext, base::size(kAES128CTRCiphertext)); } TEST(EncryptorTest, EncryptAES256CTR) { - TestAESCTREncrypt( - kAES256CTRKey, arraysize(kAES256CTRKey), - kAESCTRInitCounter, arraysize(kAESCTRInitCounter), - kAESCTRPlaintext, arraysize(kAESCTRPlaintext), - kAES256CTRCiphertext, arraysize(kAES256CTRCiphertext)); + TestAESCTREncrypt(kAES256CTRKey, base::size(kAES256CTRKey), + kAESCTRInitCounter, base::size(kAESCTRInitCounter), + kAESCTRPlaintext, base::size(kAESCTRPlaintext), + kAES256CTRCiphertext, base::size(kAES256CTRCiphertext)); } TEST(EncryptorTest, EncryptAES128CTR_MultipleDecrypt) { - TestAESCTRMultipleDecrypt( - kAES128CTRKey, arraysize(kAES128CTRKey), - kAESCTRInitCounter, arraysize(kAESCTRInitCounter), - kAESCTRPlaintext, arraysize(kAESCTRPlaintext), - kAES128CTRCiphertext, arraysize(kAES128CTRCiphertext)); + TestAESCTRMultipleDecrypt(kAES128CTRKey, base::size(kAES128CTRKey), + kAESCTRInitCounter, base::size(kAESCTRInitCounter), + kAESCTRPlaintext, base::size(kAESCTRPlaintext), + kAES128CTRCiphertext, + base::size(kAES128CTRCiphertext)); } TEST(EncryptorTest, EncryptAES256CTR_MultipleDecrypt) { - TestAESCTRMultipleDecrypt( - kAES256CTRKey, arraysize(kAES256CTRKey), - kAESCTRInitCounter, arraysize(kAESCTRInitCounter), - kAESCTRPlaintext, arraysize(kAESCTRPlaintext), - kAES256CTRCiphertext, arraysize(kAES256CTRCiphertext)); + TestAESCTRMultipleDecrypt(kAES256CTRKey, base::size(kAES256CTRKey), + kAESCTRInitCounter, base::size(kAESCTRInitCounter), + kAESCTRPlaintext, base::size(kAESCTRPlaintext), + kAES256CTRCiphertext, + base::size(kAES256CTRCiphertext)); } TEST(EncryptorTest, EncryptDecryptCTR) { diff --git a/chromium/crypto/hmac_unittest.cc b/chromium/crypto/hmac_unittest.cc index 9c42dad2b41..2d39f038364 100644 --- a/chromium/crypto/hmac_unittest.cc +++ b/chromium/crypto/hmac_unittest.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/macros.h" +#include "base/stl_util.h" #include "crypto/hmac.h" #include "testing/gtest/include/gtest/gtest.h" @@ -145,7 +145,7 @@ TEST(HMACTest, RFC2202TestCases) { "\xBB\xFF\x1A\x91" } }; - for (size_t i = 0; i < arraysize(cases); ++i) { + for (size_t i = 0; i < base::size(cases); ++i) { crypto::HMAC hmac(crypto::HMAC::SHA1); ASSERT_TRUE(hmac.Init(reinterpret_cast<const unsigned char*>(cases[i].key), cases[i].key_len)); @@ -242,7 +242,7 @@ TEST(HMACTest, HMACObjectReuse) { ASSERT_TRUE( hmac.Init(reinterpret_cast<const unsigned char*>(kSimpleKey), kSimpleKeyLength)); - for (size_t i = 0; i < arraysize(kSimpleHmacCases); ++i) { + for (size_t i = 0; i < base::size(kSimpleHmacCases); ++i) { std::string data_string(kSimpleHmacCases[i].data, kSimpleHmacCases[i].data_len); unsigned char digest[kSHA1DigestSize]; @@ -257,7 +257,7 @@ TEST(HMACTest, Verify) { hmac.Init(reinterpret_cast<const unsigned char*>(kSimpleKey), kSimpleKeyLength)); const char empty_digest[kSHA1DigestSize] = { 0 }; - for (size_t i = 0; i < arraysize(kSimpleHmacCases); ++i) { + for (size_t i = 0; i < base::size(kSimpleHmacCases); ++i) { // Expected results EXPECT_TRUE(hmac.Verify( base::StringPiece(kSimpleHmacCases[i].data, diff --git a/chromium/crypto/mock_apple_keychain.cc b/chromium/crypto/mock_apple_keychain.cc index 453114ef43b..6076813cd73 100644 --- a/chromium/crypto/mock_apple_keychain.cc +++ b/chromium/crypto/mock_apple_keychain.cc @@ -5,8 +5,8 @@ #include "crypto/mock_apple_keychain.h" #include "base/logging.h" -#include "base/macros.h" #include "base/metrics/histogram_macros.h" +#include "base/stl_util.h" #include "base/time/time.h" namespace { @@ -42,7 +42,7 @@ OSStatus MockAppleKeychain::FindGenericPassword( // The function to free this data is mocked so the cast is fine. *passwordData = const_cast<char*>(kPassword); DCHECK(passwordLength); - *passwordLength = arraysize(kPassword); + *passwordLength = base::size(kPassword); password_data_count_++; } diff --git a/chromium/crypto/p224_unittest.cc b/chromium/crypto/p224_unittest.cc index 8cfe6e7dc0d..db3662a6a90 100644 --- a/chromium/crypto/p224_unittest.cc +++ b/chromium/crypto/p224_unittest.cc @@ -9,7 +9,7 @@ #include "crypto/p224.h" -#include "base/macros.h" +#include "base/stl_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace crypto { @@ -785,7 +785,7 @@ TEST(P224, ExternalToInternalAndBack) { TEST(P224, ScalarBaseMult) { Point point; - for (size_t i = 0; i < arraysize(kNISTTestVectors); i++) { + for (size_t i = 0; i < base::size(kNISTTestVectors); i++) { p224::ScalarBaseMult(kNISTTestVectors[i].scalar, &point); const std::string external = point.ToString(); ASSERT_EQ(external.size(), 56u); |