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

Commit 85f4b7b3 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android (Google) Code Review
Browse files

Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev

parents 4f31c07f 4699e43d

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

+3 −5
Original line number Diff line number Diff line
@@ -92,12 +92,10 @@ public final class KeymasterDefs { 
    public static final int KM_ALGORITHM_HMAC = 128;



    // Block modes.

    public static final int KM_MODE_FIRST_UNAUTHENTICATED = 1;

    public static final int KM_MODE_ECB = KM_MODE_FIRST_UNAUTHENTICATED;

    public static final int KM_MODE_ECB = 1;

    public static final int KM_MODE_CBC = 2;

    public static final int KM_MODE_CTR = 4;

    public static final int KM_MODE_FIRST_AUTHENTICATED = 32;

    public static final int KM_MODE_GCM = KM_MODE_FIRST_AUTHENTICATED;

    public static final int KM_MODE_CTR = 3;

    public static final int KM_MODE_GCM = 32;



    // Padding modes.

    public static final int KM_PAD_NONE = 1;