diff options
| author | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-05-05 16:09:27 +0000 |
|---|---|---|
| committer | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-05-05 16:09:27 +0000 |
| commit | 6d6456379dfd701cb9d06b6715ae9dd048f2e721 (patch) | |
| tree | 0c4f9a86e488662d453594cb6ecc00624cf06496 /gtests/pk11_gtest | |
| parent | cf87692c41c10c2b1c837415023fc355d109814d (diff) | |
| download | nss-hg-6d6456379dfd701cb9d06b6715ae9dd048f2e721.tar.gz | |
Bug 1622033 - Disable flag for SEED deprecation. r=kjacobs,rrelyea
Differential Revision: https://phabricator.services.mozilla.com/D70672
Diffstat (limited to 'gtests/pk11_gtest')
| -rw-r--r-- | gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc | 19 | ||||
| -rw-r--r-- | gtests/pk11_gtest/pk11_seed_cbc_unittest.cc | 4 |
2 files changed, 20 insertions, 3 deletions
diff --git a/gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc b/gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc index f4accac02..139346559 100644 --- a/gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc +++ b/gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc @@ -72,10 +72,12 @@ class EncryptDeriveTest return CKM_CAMELLIA_ECB_ENCRYPT_DATA; case CKM_CAMELLIA_CBC: return CKM_CAMELLIA_CBC_ENCRYPT_DATA; +#ifndef NSS_DISABLE_DEPRECATED_SEED case CKM_SEED_ECB: return CKM_SEED_ECB_ENCRYPT_DATA; case CKM_SEED_CBC: return CKM_SEED_CBC_ENCRYPT_DATA; +#endif default: ADD_FAILURE() << "Unknown mechanism"; break; @@ -93,7 +95,9 @@ class EncryptDeriveTest case CKM_DES3_ECB: case CKM_AES_ECB: case CKM_CAMELLIA_ECB: +#ifndef NSS_DISABLE_DEPRECATED_SEED case CKM_SEED_ECB: +#endif string_data.pData = toUcharPtr(kInput); string_data.ulLen = keysize(); param.data = reinterpret_cast<uint8_t*>(&string_data); @@ -110,7 +114,9 @@ class EncryptDeriveTest case CKM_AES_CBC: case CKM_CAMELLIA_CBC: +#ifndef NSS_DISABLE_DEPRECATED_SEED case CKM_SEED_CBC: +#endif aes_data.pData = toUcharPtr(kInput); aes_data.length = keysize(); PORT_Memcpy(aes_data.iv, kIv, keysize()); @@ -132,14 +138,18 @@ class EncryptDeriveTest case CKM_DES3_ECB: case CKM_AES_ECB: case CKM_CAMELLIA_ECB: +#ifndef NSS_DISABLE_DEPRECATED_SEED case CKM_SEED_ECB: +#endif // No parameter needed here. break; case CKM_DES3_CBC: case CKM_AES_CBC: case CKM_CAMELLIA_CBC: +#ifndef NSS_DISABLE_DEPRECATED_SEED case CKM_SEED_CBC: +#endif param.data = toUcharPtr(kIv); param.len = keysize(); break; @@ -186,8 +196,13 @@ class EncryptDeriveTest TEST_P(EncryptDeriveTest, Test) { TestEncryptDerive(); } static const CK_MECHANISM_TYPE kEncryptDeriveMechanisms[] = { - CKM_DES3_ECB, CKM_DES3_CBC, CKM_AES_ECB, CKM_AES_ECB, CKM_AES_CBC, - CKM_CAMELLIA_ECB, CKM_CAMELLIA_CBC, CKM_SEED_ECB, CKM_SEED_CBC}; + CKM_DES3_ECB, CKM_DES3_CBC, CKM_AES_ECB, CKM_AES_ECB, CKM_AES_CBC, + CKM_CAMELLIA_ECB, CKM_CAMELLIA_CBC +#ifndef NSS_DISABLE_DEPRECATED_SEED + , + CKM_SEED_ECB, CKM_SEED_CBC +#endif +}; INSTANTIATE_TEST_CASE_P(EncryptDeriveTests, EncryptDeriveTest, ::testing::ValuesIn(kEncryptDeriveMechanisms)); diff --git a/gtests/pk11_gtest/pk11_seed_cbc_unittest.cc b/gtests/pk11_gtest/pk11_seed_cbc_unittest.cc index 45f77278e..7f389fef1 100644 --- a/gtests/pk11_gtest/pk11_seed_cbc_unittest.cc +++ b/gtests/pk11_gtest/pk11_seed_cbc_unittest.cc @@ -50,6 +50,7 @@ class Pkcs11SeedTest : public ::testing::Test { } }; +#ifndef NSS_DISABLE_DEPRECATED_SEED // The intention here is to test the arguments of these functions // The resulted content is already tested in EncryptDeriveTests. // SEED_CBC needs an IV of 16 bytes. @@ -76,5 +77,6 @@ TEST_F(Pkcs11SeedTest, ECB_Singleblock) { TEST_F(Pkcs11SeedTest, ECB_Multiblock) { EncryptDecryptSeed(SECSuccess, 64, 64, CKM_SEED_ECB); } +#endif -} // namespace nss_test
\ No newline at end of file +} // namespace nss_test |