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

Commit 628c6de7 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

am 24244c44: am a8232452: Merge "Fix Android Keystore key gen for keys... 

am 24244c44: am a8232452: Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev

* commit '24244c44':
  Fix Android Keystore key gen for keys requiring user auth.
parents cabcf654 24244c44

keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java

+5 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato 
            int keySizeBits,

            KeyGenParameterSpec spec) {

        // Constraints:

        // 1. Key must be authorized for signing.

        // 1. Key must be authorized for signing without user authentication.

        // 2. Signature digest must be one of key's authorized digests.

        // 3. For RSA keys, the digest output size must not exceed modulus size minus space needed

        //    for RSA PKCS#1 signature padding (about 29 bytes: minimum 10 bytes of padding + 15--19
@@ -636,6 +636,10 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato 
            // Key not authorized for signing

            return null;

        }

        if (spec.isUserAuthenticationRequired()) {

            // Key not authorized for use without user authentication

            return null;

        }

        if (!spec.isDigestsSpecified()) {

            // Key not authorized for any digests -- can't sign

            return null;