diff options
| author | sschmieg <sschmieg@google.com> | 2020-04-15 17:22:24 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2020-04-15 17:22:59 -0700 |
| commit | a43195a005c4720a5bec8998071da731fb85bac0 (patch) | |
| tree | 5e178c7b9814d0289dfc4e7f65f0f268531bb88a /cc/config | |
| parent | 15bc9c0a2c8f2a350746fb0ea0300b6956ef132b (diff) | |
| download | tink-a43195a005c4720a5bec8998071da731fb85bac0.tar.gz | |
Adding PrfSet cross language tests and fixing the missing configuration bugs
that cropped up when doing so.
Currently only HKDF can be supported because that is the only key format Tinkey
can create without a Java implementation.
PiperOrigin-RevId: 306752105
Diffstat (limited to 'cc/config')
| -rw-r--r-- | cc/config/BUILD.bazel | 3 | ||||
| -rw-r--r-- | cc/config/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cc/config/tink_config.cc | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/cc/config/BUILD.bazel b/cc/config/BUILD.bazel index 6a901727a..dde6656d5 100644 --- a/cc/config/BUILD.bazel +++ b/cc/config/BUILD.bazel @@ -13,10 +13,11 @@ cc_library( "//:key_manager", "//daead:deterministic_aead_config", "//hybrid:hybrid_config", + "//prf:prf_config", + "//proto:config_cc_proto", "//signature:signature_config", "//streamingaead:streaming_aead_config", "//util:status", - "//proto:config_cc_proto", "@com_google_absl//absl/base:core_headers", ], ) diff --git a/cc/config/CMakeLists.txt b/cc/config/CMakeLists.txt index 7e7c41334..e7224dc21 100644 --- a/cc/config/CMakeLists.txt +++ b/cc/config/CMakeLists.txt @@ -10,6 +10,7 @@ tink_cc_library( tink::core::key_manager tink::daead::deterministic_aead_config tink::hybrid::hybrid_config + tink::prf::prf_config tink::signature::signature_config tink::streamingaead::streaming_aead_config tink::util::status diff --git a/cc/config/tink_config.cc b/cc/config/tink_config.cc index f360e4b5e..d909ab8bb 100644 --- a/cc/config/tink_config.cc +++ b/cc/config/tink_config.cc @@ -17,10 +17,11 @@ #include "tink/config/tink_config.h" #include "tink/config.h" -#include "tink/key_manager.h" -#include "tink/registry.h" #include "tink/daead/deterministic_aead_config.h" #include "tink/hybrid/hybrid_config.h" +#include "tink/key_manager.h" +#include "tink/prf/prf_config.h" +#include "tink/registry.h" #include "tink/signature/signature_config.h" #include "tink/streamingaead/streaming_aead_config.h" #include "tink/util/status.h" @@ -41,6 +42,8 @@ const RegistryConfig& TinkConfig::Latest() { util::Status TinkConfig::Register() { auto status = HybridConfig::Register(); // includes Mac & Aead if (!status.ok()) return status; + status = PrfConfig::Register(); + if (!status.ok()) return status; status = SignatureConfig::Register(); if (!status.ok()) return status; status = DeterministicAeadConfig::Register(); |