Adding AesCtrHmacAeadKeyManager.

Deleting AesCtrHmacAeadParams proto as it's not used anywhere.

Change-Id: I069b6ee749ce3522c4a5935fb7b8628921bc6f0b
ORIGINAL_AUTHOR=Thai Duong <thaidn@google.com>
GitOrigin-RevId: e958abc862f4f4fce1b6d55ce1bb0dc3e12bf4dc

1 files changed, 20 insertions, 0 deletions

diff --git a/cc/registry.h b/cc/registry.h
index 929441add..8fb05d2b1 100644
--- a/cc/registry.h
+++ b/cc/registry.h
@@ -110,6 +110,14 @@ class Registry {
   static crypto::tink::util::StatusOr<std::unique_ptr<P>> GetPrimitive(
       const google::crypto::tink::KeyData& key_data);
 
+  // Convenience method for creating a new primitive for the key given
+  // in 'key'.  It looks up a KeyManager identified by type_url,
+  // and calls manager's GetPrimitive(key)-method.
+  template <class P>
+  static crypto::tink::util::StatusOr<std::unique_ptr<P>> GetPrimitive(
+      google::protobuf::StringPiece type_url,
+      const google::protobuf::Message& key);
+
   // Creates a set of primitives corresponding to the keys with
   // (status == ENABLED) in the keyset given in 'keyset_handle',
   // assuming all the corresponding key managers are present (keys
@@ -277,6 +285,18 @@ crypto::tink::util::StatusOr<std::unique_ptr<P>> Registry::GetPrimitive(
 
 // static
 template <class P>
+crypto::tink::util::StatusOr<std::unique_ptr<P>> Registry::GetPrimitive(
+    google::protobuf::StringPiece type_url,
+    const google::protobuf::Message& key) {
+  auto key_manager_result = get_key_manager<P>(type_url);
+  if (key_manager_result.ok()) {
+    return key_manager_result.ValueOrDie()->GetPrimitive(key);
+  }
+  return key_manager_result.status();
+}
+
+// static
+template <class P>
 crypto::tink::util::StatusOr<std::unique_ptr<PrimitiveSet<P>>>
     Registry::GetPrimitives(
         const KeysetHandle& keyset_handle,