Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c58ba87 authored by Alex Klyubin's avatar Alex Klyubin Committed by Gerrit Code Review
Browse files

Merge "Add missing mapping between JCA and keystore HMAC names."

parents d9f32b16 5324702a

keystore/java/android/security/AndroidKeyStoreProvider.java

+1 −0
Original line number Diff line number Diff line
@@ -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");

keystore/java/android/security/KeyStoreKeyConstraints.java

+10 −0
Original line number Diff line number Diff line
@@ -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);