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

Commit 4c25a00e authored by Shawn Willden's avatar Shawn Willden Committed by Android Git Automerger
Browse files

am bb399afc: am 687b3259: am 09614808: Merge "Reflect removal of... 

am bb399afc: am 687b3259: am 09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev

* commit 'bb399afc':
  Reflect removal of KM_TAG_AEAD_TAG from keymaster.
parents 87210001 bb399afc

core/java/android/security/keymaster/KeymasterDefs.java

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ public final class KeymasterDefs { 


    public static final int KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000;

    public static final int KM_TAG_NONCE = KM_BYTES | 1001;

    public static final int KM_TAG_AUTH_TOKEN = KM_BYTES | 1003;

    public static final int KM_TAG_MAC_LENGTH = KM_INT | 1004;

    public static final int KM_TAG_AUTH_TOKEN = KM_BYTES | 1002;

    public static final int KM_TAG_MAC_LENGTH = KM_INT | 1003;



    // Algorithm values.

    public static final int KM_ALGORITHM_RSA = 1;