Add challenge to GateKeeper

needed for enrollment of auxiliary authenticators

Change-Id: Id2d567fc2736dc7c1960b337b4d4d0d93219ccfc

2 files changed, 3 insertions, 1 deletions

diff --git a/include/gatekeeper/gatekeeper.h b/include/gatekeeper/gatekeeper.h
index 10f8791..2ba148a 100644
--- a/include/gatekeeper/gatekeeper.h
+++ b/include/gatekeeper/gatekeeper.h
@@ -133,7 +133,7 @@ private:
      * Also returns the length in length if it is not null.
      */
     void MintAuthToken(UniquePtr<uint8_t> *auth_token, uint32_t *length, uint32_t timestamp,
-            secure_id_t user_id, secure_id_t authenticator_id);
+            secure_id_t user_id, secure_id_t authenticator_id, uint64_t challenge);
 
     /**
      * Verifies that handle matches password HMAC'ed with the password_key
diff --git a/include/gatekeeper/gatekeeper_messages.h b/include/gatekeeper/gatekeeper_messages.h
index a98e1c5..0f89047 100644
--- a/include/gatekeeper/gatekeeper_messages.h
+++ b/include/gatekeeper/gatekeeper_messages.h
@@ -127,6 +127,7 @@ struct GateKeeperMessage {
 struct VerifyRequest : public GateKeeperMessage {
     VerifyRequest(
             uint32_t user_id,
+            uint64_t challenge,
             SizedBuffer *enrolled_password_handle,
             SizedBuffer *provided_password_payload);
     VerifyRequest();
@@ -136,6 +137,7 @@ struct VerifyRequest : public GateKeeperMessage {
     virtual void nonErrorSerialize(uint8_t *buffer) const;
     virtual gatekeeper_error_t nonErrorDeserialize(const uint8_t *payload, const uint8_t *end);
 
+    uint64_t challenge;
     SizedBuffer password_handle;
     SizedBuffer provided_password;
 };