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/cleartext_keyset_handle.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/cleartext_keyset_handle.h')
-rw-r--r-- | cc/cleartext_keyset_handle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/cleartext_keyset_handle.h b/cc/cleartext_keyset_handle.h index 428cf3b3c..17d95fda6 100644 --- a/cc/cleartext_keyset_handle.h +++ b/cc/cleartext_keyset_handle.h @@ -31,11 +31,11 @@ namespace tink { // loading cleartext keysets, thus its usage should be restricted. class CleartextKeysetHandle { public: - static util::StatusOr<std::unique_ptr<KeysetHandle>> New( + static crypto::tink::util::StatusOr<std::unique_ptr<KeysetHandle>> New( const google::crypto::tink::Keyset& keyset); - static util::StatusOr<std::unique_ptr<KeysetHandle>> ParseFrom( + static crypto::tink::util::StatusOr<std::unique_ptr<KeysetHandle>> ParseFrom( const std::string& serialized_keyset); - static util::StatusOr<std::unique_ptr<KeysetHandle>> ParseFrom( + static crypto::tink::util::StatusOr<std::unique_ptr<KeysetHandle>> ParseFrom( std::istream* keyset_stream); private: CleartextKeysetHandle() {} |