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

Commit 38bb642b authored by Alex Klyubin's avatar Alex Klyubin
Browse files

Add BlockMode.GCM constant to AndroidKeyStore API. 

GCM mode is not yet implemented. This is just adding a constant to
KeyStoreKeyConstraints.BlockMode.

Bug: 18088752
Change-Id: Ibba5b393f56ab9f6bb96d994f110687ab8d65ff3
parent 558184f5

keystore/java/android/security/KeyStoreKeyConstraints.java

+12 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ public abstract class KeyStoreKeyConstraints { 


    @Retention(RetentionPolicy.SOURCE)

    @IntDef(flag = true,

            value = {BlockMode.ECB, BlockMode.CBC, BlockMode.CTR})

            value = {BlockMode.ECB, BlockMode.CBC, BlockMode.CTR, BlockMode.GCM})

    public @interface BlockModeEnum {}



    /**
@@ -489,6 +489,9 @@ public abstract class KeyStoreKeyConstraints { 
        /** Counter (CTR) block mode. */

        public static final int CTR = 1 << 2;



        /** Galois/Counter Mode (GCM) block mode. */

        public static final int GCM = 1 << 3;



        /**

         * @hide

         */
@@ -500,6 +503,8 @@ public abstract class KeyStoreKeyConstraints { 
                    return KeymasterDefs.KM_MODE_CBC;

                case CTR:

                    return KeymasterDefs.KM_MODE_CTR;

                case GCM:

                    return KeymasterDefs.KM_MODE_GCM;

                default:

                    throw new IllegalArgumentException("Unknown block mode: " + mode);

            }
@@ -516,6 +521,8 @@ public abstract class KeyStoreKeyConstraints { 
                    return CBC;

                case KeymasterDefs.KM_MODE_CTR:

                    return CTR;

                case KeymasterDefs.KM_MODE_GCM:

                    return GCM;

                default:

                    throw new IllegalArgumentException("Unknown block mode: " + mode);

            }
@@ -554,6 +561,8 @@ public abstract class KeyStoreKeyConstraints { 
                    return "CBC";

                case CTR:

                    return "CTR";

                case GCM:

                    return "GCM";

                default:

                    throw new IllegalArgumentException("Unknown block mode: " + mode);

            }
@@ -570,6 +579,8 @@ public abstract class KeyStoreKeyConstraints { 
                return CBC;

            } else if ("ctr".equals(modeLower)) {

                return CTR;

            } else if ("gcm".equals(modeLower)) {

                return CTR;

            } else {

                throw new IllegalArgumentException("Unknown block mode: " + mode);

            }