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

Commit 024bce82 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android (Google) Code Review
Browse files

Merge "Support loading AES keys with authorized digests." into mnc-dev

parents a5c82a6b ca7aaeae

keystore/java/android/security/keystore/KeyProperties.java

+0 −4
Original line number Diff line number Diff line
@@ -210,10 +210,6 @@ public abstract class KeyProperties { 
                int keymasterAlgorithm, int keymasterDigest) {

            switch (keymasterAlgorithm) {

                case KeymasterDefs.KM_ALGORITHM_AES:

                    if (keymasterDigest != -1) {

                        throw new IllegalArgumentException("Digest not supported for AES key: "

                                + Digest.fromKeymaster(keymasterDigest));

                    }

                    return KEY_ALGORITHM_AES;

                case KeymasterDefs.KM_ALGORITHM_HMAC:

                    switch (keymasterDigest) {