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

Track Keymaster changes.

Browse Source 
* MAC length is now specified as a parameters to the begin operation
  instead of as a parameter at key generation/import time.
* KM_TAG_MAC_LENGTH is now in bits instead of in bytes.

Change-Id: I752fe232d11d3ac39a575a48948215d84ded8fb9
This commit is contained in:
Alex Klyubin
2015-04-30 10:50:45 -07:00
parent 403ac2d64f
commit 7ea5090264
4 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
keystore/java/android/security/KeymasterUtils.java
View File

@@ -179,22 +179,22 @@ public abstract class KeymasterUtils {
return result;
}
public static int getDigestOutputSizeBytes(int keymasterDigest) {
public static int getDigestOutputSizeBits(int keymasterDigest) {
switch (keymasterDigest) {
case KeymasterDefs.KM_DIGEST_NONE:
return -1;
case KeymasterDefs.KM_DIGEST_MD5:
return 128 / 8;
return 128;
case KeymasterDefs.KM_DIGEST_SHA1:
return 160 / 8;
return 160;
case KeymasterDefs.KM_DIGEST_SHA_2_224:
return 224 / 8;
return 224;
case KeymasterDefs.KM_DIGEST_SHA_2_256:
return 256 / 8;
return 256;
case KeymasterDefs.KM_DIGEST_SHA_2_384:
return 384 / 8;
return 384;
case KeymasterDefs.KM_DIGEST_SHA_2_512:
return 512 / 8;
return 512;
default:
throw new IllegalArgumentException("Unknown digest: " + keymasterDigest);
}