diff options
Diffstat (limited to 'security/nss/gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc')
| -rw-r--r-- | security/nss/gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/security/nss/gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc b/security/nss/gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc index f4accac02..139346559 100644 --- a/security/nss/gtests/pk11_gtest/pk11_encrypt_derive_unittest.cc +++ b/security/nss/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)); |