diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 11:32:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-18 13:40:17 +0000 |
| commit | 31ccca0778db85c159634478b4ec7997f6704860 (patch) | |
| tree | 3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/crypto | |
| parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) | |
| download | qtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz | |
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/crypto')
| -rw-r--r-- | chromium/crypto/aead_unittest.cc | 2 | ||||
| -rw-r--r-- | chromium/crypto/symmetric_key_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chromium/crypto/aead_unittest.cc b/chromium/crypto/aead_unittest.cc index 50b73dc494f..00d56a1a398 100644 --- a/chromium/crypto/aead_unittest.cc +++ b/chromium/crypto/aead_unittest.cc @@ -17,7 +17,7 @@ const crypto::Aead::AeadAlgorithm kAllAlgorithms[]{ class AeadTest : public testing::TestWithParam<crypto::Aead::AeadAlgorithm> {}; -INSTANTIATE_TEST_SUITE_P(, AeadTest, testing::ValuesIn(kAllAlgorithms)); +INSTANTIATE_TEST_SUITE_P(All, AeadTest, testing::ValuesIn(kAllAlgorithms)); TEST_P(AeadTest, SealOpen) { crypto::Aead::AeadAlgorithm alg = GetParam(); diff --git a/chromium/crypto/symmetric_key_unittest.cc b/chromium/crypto/symmetric_key_unittest.cc index 05ae25e0668..4fd3838710f 100644 --- a/chromium/crypto/symmetric_key_unittest.cc +++ b/chromium/crypto/symmetric_key_unittest.cc @@ -207,10 +207,10 @@ static const ScryptTestVector kTestVectorsScrypt[] = { "7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d54329556" "13f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887"}}; -INSTANTIATE_TEST_SUITE_P(, +INSTANTIATE_TEST_SUITE_P(All, SymmetricKeyDeriveKeyFromPasswordUsingPbkdf2Test, testing::ValuesIn(kTestVectorsPbkdf2)); -INSTANTIATE_TEST_SUITE_P(, +INSTANTIATE_TEST_SUITE_P(All, SymmetricKeyDeriveKeyFromPasswordUsingScryptTest, testing::ValuesIn(kTestVectorsScrypt)); |