Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pir/testing/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,14 @@ cc_library(
"//pir/testing/data:embedded_public_key",
"@com_google_absl//absl/base",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/log:absl_check",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@tink_cc//tink:cleartext_keyset_handle_testonly",
"@tink_cc//tink:hybrid_decrypt",
"@tink_cc//tink:hybrid_encrypt",
"@tink_cc//tink:keyset_handle",
"@tink_cc//tink:keyset_reader",
"@tink_cc//tink/hybrid:hybrid_config",
"@tink_cc//tink/hybrid:config_v0",
"@tink_cc//tink/json:json_keyset_reader",
],
)
Expand Down
20 changes: 7 additions & 13 deletions pir/testing/encrypt_decrypt.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@

#include "absl/base/attributes.h"
#include "absl/base/call_once.h"
#include "absl/log/absl_check.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "dpf/status_macros.h"
#include "pir/testing/data/embedded_private_key.h"
#include "pir/testing/data/embedded_public_key.h"
#include "tink/cleartext_keyset_handle.h"
#include "tink/hybrid/hybrid_config.h"
#include "tink/hybrid/config_v0.h"
#include "tink/hybrid_decrypt.h"
#include "tink/hybrid_encrypt.h"
#include "tink/json/json_keyset_reader.h"
#include "tink/keyset_handle.h"
#include "tink/keyset_reader.h"
Expand All @@ -45,10 +45,6 @@ using ::crypto::tink::KeysetReader;
absl::once_flag register_tink_once ABSL_ATTRIBUTE_UNUSED;

absl::StatusOr<std::unique_ptr<HybridDecrypt>> CreateFakeHybridDecrypt() {
absl::call_once(register_tink_once, []() {
ABSL_CHECK_OK(crypto::tink::HybridConfig::Register());
});

const auto* const toc = embedded_private_key_create();
absl::string_view private_key_json(toc->data, toc->size);

Expand All @@ -59,14 +55,11 @@ absl::StatusOr<std::unique_ptr<HybridDecrypt>> CreateFakeHybridDecrypt() {
std::unique_ptr<KeysetHandle> private_key_handle,
CleartextKeysetHandle::Read(std::move(private_key_reader)));

return private_key_handle->GetPrimitive<HybridDecrypt>();
return private_key_handle->GetPrimitive<HybridDecrypt>(
crypto::tink::ConfigHybridV0());
}

absl::StatusOr<std::unique_ptr<HybridEncrypt>> CreateFakeHybridEncrypt() {
absl::call_once(register_tink_once, []() {
ABSL_CHECK_OK(crypto::tink::HybridConfig::Register());
});

const auto* const toc = embedded_public_key_create();
absl::string_view public_key_json(toc->data, toc->size);

Expand All @@ -77,7 +70,8 @@ absl::StatusOr<std::unique_ptr<HybridEncrypt>> CreateFakeHybridEncrypt() {
std::unique_ptr<KeysetHandle> public_key_handle,
CleartextKeysetHandle::Read(std::move(public_key_reader)));

return public_key_handle->GetPrimitive<HybridEncrypt>();
return public_key_handle->GetPrimitive<HybridEncrypt>(
crypto::tink::ConfigHybridV0());
}

} // namespace pir_testing
Expand Down