diff options
| author | cinlin <cinlin@google.com> | 2023-03-15 03:34:22 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-15 03:35:32 -0700 |
| commit | 0d1a51969dd2edca7220484e6acd5ad170bd5a61 (patch) | |
| tree | d0ae0b6a60e17c31e35a8420013358e497d0a052 /cc/config | |
| parent | f2c143558455edcafa2b5850e860963d9942ecfe (diff) | |
| download | tink-0d1a51969dd2edca7220484e6acd5ad170bd5a61.tar.gz | |
Define KeysetHandle::GetPrimitive() with Configuration. #tinkApiChange
PiperOrigin-RevId: 516777900
Diffstat (limited to 'cc/config')
| -rw-r--r-- | cc/config/BUILD.bazel | 1 | ||||
| -rw-r--r-- | cc/config/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cc/config/fips_140_2_test.cc | 8 |
3 files changed, 7 insertions, 3 deletions
diff --git a/cc/config/BUILD.bazel b/cc/config/BUILD.bazel index 7ecb7b8e4..8d9dd0be1 100644 --- a/cc/config/BUILD.bazel +++ b/cc/config/BUILD.bazel @@ -150,6 +150,7 @@ cc_test( "//signature:ecdsa_verify_key_manager", "//signature:rsa_ssa_pkcs1_verify_key_manager", "//signature:rsa_ssa_pss_verify_key_manager", + "//util:test_keyset_handle", "//util:test_matchers", "//util:test_util", "@com_google_googletest//:gtest_main", diff --git a/cc/config/CMakeLists.txt b/cc/config/CMakeLists.txt index 38a51df5f..3a5f05df9 100644 --- a/cc/config/CMakeLists.txt +++ b/cc/config/CMakeLists.txt @@ -134,6 +134,7 @@ tink_cc_test( tink::signature::ecdsa_verify_key_manager tink::signature::rsa_ssa_pkcs1_verify_key_manager tink::signature::rsa_ssa_pss_verify_key_manager + tink::util::test_keyset_handle tink::util::test_matchers tink::util::test_util tink::proto::tink_cc_proto diff --git a/cc/config/fips_140_2_test.cc b/cc/config/fips_140_2_test.cc index d4c79282a..4140da3a9 100644 --- a/cc/config/fips_140_2_test.cc +++ b/cc/config/fips_140_2_test.cc @@ -33,6 +33,7 @@ #include "tink/signature/ecdsa_verify_key_manager.h" #include "tink/signature/rsa_ssa_pkcs1_verify_key_manager.h" #include "tink/signature/rsa_ssa_pss_verify_key_manager.h" +#include "tink/util/test_keyset_handle.h" #include "tink/util/test_matchers.h" #include "tink/util/test_util.h" #include "proto/tink.pb.h" @@ -119,10 +120,11 @@ TEST_F(Fips1402Test, NewKeyDataAndWrapKeysetSucceeds) { KeyStatusType::ENABLED, &keyset); keyset.set_primary_key_id(key_id); - absl::flat_hash_map<std::string, std::string> annotations; + std::unique_ptr<KeysetHandle> handle = + TestKeysetHandle::GetKeysetHandle(keyset); util::StatusOr<std::unique_ptr<Aead>> aead = - registry.WrapKeyset<Aead>(keyset, annotations); - ASSERT_THAT(aead, IsOk()); + handle->GetPrimitive<Aead>(ConfigFips140_2()); + EXPECT_THAT(aead, IsOk()); std::string plaintext = "plaintext"; std::string ad = "ad"; |