From 8e0035c0ccde3c5dddc73043a8c755515d1d594c Mon Sep 17 00:00:00 2001
From: Janis Danisevskis <jdanis@google.com>
Date: Thu, 11 Feb 2021 23:16:58 -0800
Subject: [PATCH] Gatekeeper: Add missing user_id.

Auth tokens sent to keystore2 where missing the user id.

Test: Timeout bound keys can be authorized.
Change-Id: Ifd27d2d8c4e153d2e21460574a073516e276aae0
---
 gatekeeperd/gatekeeperd.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gatekeeperd/gatekeeperd.cpp b/gatekeeperd/gatekeeperd.cpp
index 781b4afb0..f9c0cddb4 100644
--- a/gatekeeperd/gatekeeperd.cpp
+++ b/gatekeeperd/gatekeeperd.cpp
@@ -318,6 +318,7 @@ class GateKeeperProxy : public BnGateKeeperService {
 
                     authToken.timestamp.milliSeconds = betoh64(hwAuthToken->timestamp);
                     authToken.challenge = hwAuthToken->challenge;
+                    authToken.userId = hwAuthToken->user_id;
                     authToken.authenticatorId = hwAuthToken->authenticator_id;
                     authToken.authenticatorType = static_cast<HardwareAuthenticatorType>(
                             betoh32(hwAuthToken->authenticator_type));