Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3283d2d2: Merge "Add BlockMode.GCM constant to AndroidKeyStore API."

Browse Source 
* commit '3283d2d208c0686fa964008e1520179948886adb':
  Add BlockMode.GCM constant to AndroidKeyStore API.
This commit is contained in:
Alex Klyubin
2015-04-08 21:37:04 +00:00
committed by Android Git Automerger
parent ff5e9554cf 3283d2d208
commit 0649c832b8
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
keystore/java/android/security/KeyStoreKeyConstraints.java
View File

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