Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1607b3ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix for the documentation in TimeStampToken.aidl. HMAC computation will... 

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: 006bdf3f am: 94131d87

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

Change-Id: Ied8b5ca9a7d2ae2d6716c4fa31705fd32dcd6472
parents 9c86b058 94131d87

security/secureclock/aidl/android/hardware/security/secureclock/TimeStampToken.aidl

+2 −4
Original line number Diff line number Diff line
@@ -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;

}