From 8ac07435088dff7d7e09d40e951c06aec37e053c Mon Sep 17 00:00:00 2001 From: Chirag Pathak Date: Tue, 25 May 2021 16:01:27 +0000 Subject: [PATCH] Fix for the documentation in TimeStampToken.aidl. HMAC computation will always use 1, which is the value of SecurityLevel.TRUSTED_ENVIRONMENT. This is done for backwards compatibility purpose. Test: N/A Bug: None. Change-Id: I1fd979908103f9095cc7c306e0d5036d6b357b30 --- .../hardware/security/secureclock/TimeStampToken.aidl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/security/secureclock/aidl/android/hardware/security/secureclock/TimeStampToken.aidl b/security/secureclock/aidl/android/hardware/security/secureclock/TimeStampToken.aidl index 2fbd29afa7..fcf2ee8dd7 100644 --- a/security/secureclock/aidl/android/hardware/security/secureclock/TimeStampToken.aidl +++ b/security/secureclock/aidl/android/hardware/security/secureclock/TimeStampToken.aidl @@ -39,7 +39,7 @@ parcelable TimeStampToken { * 32-byte HMAC-SHA256 of the above values, computed as: * * HMAC(H, - * ISecureClock.TIME_STAMP_MAC_LABEL || challenge || timestamp || securityLevel ) + * ISecureClock.TIME_STAMP_MAC_LABEL || challenge || timestamp || 1 ) * * where: * @@ -50,9 +50,7 @@ parcelable TimeStampToken { * ``||'' represents concatenation * * The representation of challenge and timestamp is as 64-bit unsigned integers in big-endian - * order. SecurityLevel is represented as a 32-bit unsigned integer in big-endian order as - * described in android.hardware.security.keymint.SecurityLevel. It represents the security - * level of the secure clock environment. + * order. 1, above, is a 32-bit unsigned integer, also big-endian. */ byte[] mac; }