diff options
| author | Andres Morales <anmorales@google.com> | 2015-04-13 18:52:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-13 18:52:27 +0000 |
| commit | 21cc48344292617c2724f9dfccc8fd8de7970885 (patch) | |
| tree | 3f82852342207f170abb79bcd962cbb412d8dd23 /include | |
| parent | 059320212496f83fd4b64c8252c507258058629d (diff) | |
| parent | 9e4985e8cb40e6e53a01a1080c210c0c09be305f (diff) | |
| download | hardware_libhardware-21cc48344292617c2724f9dfccc8fd8de7970885.zip hardware_libhardware-21cc48344292617c2724f9dfccc8fd8de7970885.tar.gz hardware_libhardware-21cc48344292617c2724f9dfccc8fd8de7970885.tar.bz2 | |
am 9e4985e8: am 845ffcea: Merge "hw_auth_token: make timestamp 64 bits"
* commit '9e4985e8cb40e6e53a01a1080c210c0c09be305f':
hw_auth_token: make timestamp 64 bits
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware/hw_auth_token.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hardware/hw_auth_token.h b/include/hardware/hw_auth_token.h index 2740758..f471d1a 100644 --- a/include/hardware/hw_auth_token.h +++ b/include/hardware/hw_auth_token.h @@ -42,7 +42,7 @@ typedef struct __attribute__((__packed__)) { uint64_t user_id; // secure user ID, not Android user ID uint64_t authenticator_id; // secure authenticator ID uint32_t authenticator_type; // hw_authenticator_type_t, in network order - uint32_t timestamp; // in network order + uint64_t timestamp; // in network order uint8_t hmac[32]; } hw_auth_token_t; |