Merge "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." am: 006bdf3fa9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1717931

Change-Id: I25112411c12a7715a6403d3b40cad6c161ac7ef9
This commit is contained in:
Treehugger Robot
2021-06-01 19:40:17 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}