am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."

* commit '21c4e465f6a4783a9356bf1d88bda42192af022f':
  Add missing mapping between JCA and keystore HMAC names.

2 files changed, 11 insertions, 0 deletions

diff --git a/keystore/java/android/security/AndroidKeyStoreProvider.java b/keystore/java/android/security/AndroidKeyStoreProvider.java
index 635b2fa94b09..43f3b30fa4fb 100644
--- a/keystore/java/android/security/AndroidKeyStoreProvider.java
+++ b/keystore/java/android/security/AndroidKeyStoreProvider.java
@@ -64,6 +64,7 @@ public class AndroidKeyStoreProvider extends Provider {
         putSecretKeyFactoryImpl("HmacSHA512");
 
         // javax.crypto.Mac
+        putMacImpl("HmacSHA1", PACKAGE_NAME + ".KeyStoreHmacSpi$HmacSHA1");
         putMacImpl("HmacSHA224", PACKAGE_NAME + ".KeyStoreHmacSpi$HmacSHA224");
         putMacImpl("HmacSHA256", PACKAGE_NAME + ".KeyStoreHmacSpi$HmacSHA256");
         putMacImpl("HmacSHA384", PACKAGE_NAME + ".KeyStoreHmacSpi$HmacSHA384");
diff --git a/keystore/java/android/security/KeyStoreKeyConstraints.java b/keystore/java/android/security/KeyStoreKeyConstraints.java
index 7f691fb0c606..02108fd7b10a 100644
--- a/keystore/java/android/security/KeyStoreKeyConstraints.java
+++ b/keystore/java/android/security/KeyStoreKeyConstraints.java
@@ -213,8 +213,18 @@ public abstract class KeyStoreKeyConstraints {
                         throw new IllegalArgumentException("HMAC digest not specified");
                     }
                     switch (digest) {
+                        case Digest.MD5:
+                            return "HmacMD5";
+                        case Digest.SHA1:
+                            return "HmacSHA1";
+                        case Digest.SHA224:
+                            return "HmacSHA224";
                         case Digest.SHA256:
                             return "HmacSHA256";
+                        case Digest.SHA384:
+                            return "HmacSHA384";
+                        case Digest.SHA512:
+                            return "HmacSHA512";
                         default:
                             throw new IllegalArgumentException(
                                     "Unsupported HMAC digest: " + digest);