diff options
| author | Thai Duong <thaidn@google.com> | 2017-08-29 16:40:37 -0700 |
|---|---|---|
| committer | Thai Duong <thaidn@google.com> | 2017-09-01 15:21:06 -0700 |
| commit | 14f57e6f0605f31f5f8a0c31456ab5d90f4f91d4 (patch) | |
| tree | b887279ee0c25f3cd27882a2f747787cab8b5741 /cc/key_manager.h | |
| parent | fa20557afb277cac4bcde628f866800d55f0e47a (diff) | |
| download | tink-14f57e6f0605f31f5f8a0c31456ab5d90f4f91d4.tar.gz | |
Move util to crypto::tink::util.
Change-Id: I2e628298c31e26da0067196634b5dc4d3bd5ed84
ORIGINAL_AUTHOR=Thai Duong <thaidn@google.com>
GitOrigin-RevId: 9b88cb7f7aad68ff16094ab7ff6a3a1620f58cd5
Diffstat (limited to 'cc/key_manager.h')
| -rw-r--r-- | cc/key_manager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/key_manager.h b/cc/key_manager.h index 310239382..7a512ce40 100644 --- a/cc/key_manager.h +++ b/cc/key_manager.h @@ -43,15 +43,15 @@ template<class P> class KeyManager { public: // Constructs an instance of P for the given 'key_data'. - virtual util::StatusOr<std::unique_ptr<P>> + virtual crypto::tink::util::StatusOr<std::unique_ptr<P>> GetPrimitive(const google::crypto::tink::KeyData& key_data) const = 0; // Constructs an instance of P for the given 'key'. - virtual util::StatusOr<std::unique_ptr<P>> + virtual crypto::tink::util::StatusOr<std::unique_ptr<P>> GetPrimitive(const google::protobuf::Message& key) const = 0; // Generates a new random key, based on the specified 'key_template'. - virtual util::StatusOr<std::unique_ptr<google::protobuf::Message>> NewKey( + virtual crypto::tink::util::StatusOr<std::unique_ptr<google::protobuf::Message>> NewKey( const google::crypto::tink::KeyTemplate& key_template) const = 0; // Returns the type_url identifying the key type handled by this manager. |