commit f10e2890fd223d37c024ec2d1b3b89aec8d72d76
author Andres Morales <anmorales@google.com> Mon Mar 23 12:03:56 2015 -0700
committer Andres Morales <anmorales@google.com> Mon Mar 23 18:32:04 2015 -0700
tree d0608c1a41d0db7cbc216be16663635d541ba080
parent 11c2a51cab5e4e13590022720b3f8391128ce9d3

Allow impls of GateKeeper to keep ownership of key ptr

We require the lifecycle of the key ptr to be maintained
by the implementation as different constraints may
be placed on keeping keys in memory depending on the
implementation.

Change-Id: I20180029e738e6ee610db0bca53cc136375634e9

gatekeeper.cpp

diff --git a/gatekeeper.cpp b/gatekeeper.cpp
index 5b3ca5d..2205801 100644
--- a/gatekeeper.cpp
+++ b/gatekeeper.cpp
@@ -150,16 +150,16 @@
     memcpy(to_sign, &password_handle->version, metadata_length);
     memcpy(to_sign + metadata_length, password, password_length);
 
-    UniquePtr<uint8_t> password_key;
+    const uint8_t *password_key = NULL;
     size_t password_key_length = 0;
     GetPasswordKey(&password_key, &password_key_length);
 
-    if (!password_key.get() || password_key_length == 0) {
+    if (!password_key || password_key_length == 0) {
         return false;
     }
 
     ComputePasswordSignature(password_handle->signature, sizeof(password_handle->signature),
-            password_key.get(), password_key_length, to_sign, sizeof(to_sign), salt);
+            password_key, password_key_length, to_sign, sizeof(to_sign), salt);
     return true;
 }
 
@@ -198,12 +198,12 @@
     token->auxiliary_secure_user_id = authenticator_id;
     token->timestamp = timestamp;
 
-    UniquePtr<uint8_t> auth_token_key;
-    size_t key_len;
+    const uint8_t *auth_token_key = NULL;
+    size_t key_len = 0;
     GetAuthTokenKey(&auth_token_key, &key_len);
 
     size_t hash_len = (size_t)((uint8_t *)&token->hmac - (uint8_t *)token);
-    ComputeSignature(token->hmac, sizeof(token->hmac), auth_token_key.get(), key_len,
+    ComputeSignature(token->hmac, sizeof(token->hmac), auth_token_key, key_len,
             reinterpret_cast<uint8_t *>(token), hash_len);
 
     if (length != NULL) *length = sizeof(AuthToken);