diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-05-29 18:01:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-29 18:01:08 +0000 |
| commit | 1a23c31752f1295c708cf749a7828dc42e4e9d9e (patch) | |
| tree | 302cb16b79149c5b9ca0ecc0f7de2d768e5c62d8 | |
| parent | 51c1e3bd149d2e10e68ad72fd7d25ef826a6075c (diff) | |
| parent | a8c837f11a53b094228b8faf8da0b09d80b6b1ef (diff) | |
| download | frameworks_base-1a23c31752f1295c708cf749a7828dc42e4e9d9e.zip frameworks_base-1a23c31752f1295c708cf749a7828dc42e4e9d9e.tar.gz frameworks_base-1a23c31752f1295c708cf749a7828dc42e4e9d9e.tar.bz2 | |
Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreBCWorkaroundProvider.java | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreBCWorkaroundProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreBCWorkaroundProvider.java index 3774e36..aed5875 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreBCWorkaroundProvider.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreBCWorkaroundProvider.java @@ -51,10 +51,29 @@ class AndroidKeyStoreBCWorkaroundProvider extends Provider { // javax.crypto.Mac putMacImpl("HmacSHA1", PACKAGE_NAME + ".AndroidKeyStoreHmacSpi$HmacSHA1"); + put("Alg.Alias.Mac.1.2.840.113549.2.7", "HmacSHA1"); + put("Alg.Alias.Mac.HMAC-SHA1", "HmacSHA1"); + put("Alg.Alias.Mac.HMAC/SHA1", "HmacSHA1"); + putMacImpl("HmacSHA224", PACKAGE_NAME + ".AndroidKeyStoreHmacSpi$HmacSHA224"); + put("Alg.Alias.Mac.1.2.840.113549.2.9", "HmacSHA224"); + put("Alg.Alias.Mac.HMAC-SHA224", "HmacSHA224"); + put("Alg.Alias.Mac.HMAC/SHA224", "HmacSHA224"); + putMacImpl("HmacSHA256", PACKAGE_NAME + ".AndroidKeyStoreHmacSpi$HmacSHA256"); + put("Alg.Alias.Mac.1.2.840.113549.2.9", "HmacSHA256"); + put("Alg.Alias.Mac.HMAC-SHA256", "HmacSHA256"); + put("Alg.Alias.Mac.HMAC/SHA256", "HmacSHA256"); + putMacImpl("HmacSHA384", PACKAGE_NAME + ".AndroidKeyStoreHmacSpi$HmacSHA384"); + put("Alg.Alias.Mac.1.2.840.113549.2.10", "HmacSHA384"); + put("Alg.Alias.Mac.HMAC-SHA384", "HmacSHA384"); + put("Alg.Alias.Mac.HMAC/SHA384", "HmacSHA384"); + putMacImpl("HmacSHA512", PACKAGE_NAME + ".AndroidKeyStoreHmacSpi$HmacSHA512"); + put("Alg.Alias.Mac.1.2.840.113549.2.11", "HmacSHA512"); + put("Alg.Alias.Mac.HMAC-SHA512", "HmacSHA512"); + put("Alg.Alias.Mac.HMAC/SHA512", "HmacSHA512"); // javax.crypto.Cipher putSymmetricCipherImpl("AES/ECB/NoPadding", |