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

Commit 1cf90f78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Updating accepted HMAC key sizes"

parents 35dd014a ca0d4d8f

keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java

+2 −6
Original line number Diff line number Diff line
@@ -210,13 +210,9 @@ public abstract class AndroidKeyStoreKeyGeneratorSpi extends KeyGeneratorSpi { 
                    }

                }

                if (mKeymasterAlgorithm == KeymasterDefs.KM_ALGORITHM_HMAC) {

                    if (mKeySizeBits < 64) {

                    if (mKeySizeBits < 64 || mKeySizeBits > 512) {

                        throw new InvalidAlgorithmParameterException(

                            "HMAC key size must be at least 64 bits.");

                    }

                    if (mKeySizeBits > 512 && spec.isStrongBoxBacked()) {

                        throw new InvalidAlgorithmParameterException(

                            "StrongBox HMAC key size must be smaller than 512 bits.");

                            "HMAC key sizes must be within 64-512 bits, inclusive.");

                    }



                    // JCA HMAC key algorithm implies a digest (e.g., HmacSHA256 key algorithm