From 4ab8ea4498aa25eafdbaadd238fed6eab3f6ee59 Mon Sep 17 00:00:00 2001
From: Alex Klyubin <klyubin@google.com>
Date: Fri, 27 Mar 2015 16:53:44 -0700
Subject: Add HmacSHA256 backed by AndroidKeyStore.

This also adds the MAC length constraint on imported HMAC keys. HMAC
doesn't work without this constraint at the moment.

Bug: 18088752
Change-Id: I8613f58f5d2a84df00bcf6179d13e30619440330
---
 keystore/java/android/security/AndroidKeyStoreProvider.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'keystore/java/android/security/AndroidKeyStoreProvider.java')

diff --git a/keystore/java/android/security/AndroidKeyStoreProvider.java b/keystore/java/android/security/AndroidKeyStoreProvider.java
index 598bcd8dcd3d..7313c489cbfe 100644
--- a/keystore/java/android/security/AndroidKeyStoreProvider.java
+++ b/keystore/java/android/security/AndroidKeyStoreProvider.java
@@ -39,5 +39,9 @@ public class AndroidKeyStoreProvider extends Provider {
         // javax.crypto.KeyGenerator
         put("KeyGenerator.AES", KeyStoreKeyGeneratorSpi.AES.class.getName());
         put("KeyGenerator.HmacSHA256", KeyStoreKeyGeneratorSpi.HmacSHA256.class.getName());
+
+        // javax.crypto.Mac
+        put("Mac.HmacSHA256", KeyStoreHmacSpi.HmacSHA256.class.getName());
+        put("Mac.HmacSHA256 SupportedKeyClasses", KeyStoreSecretKey.class.getName());
     }
 }
-- 
cgit v1.2.3