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

Commit 512c132f authored by Shawn Willden's avatar Shawn Willden
Browse files

Revert "Add option to allow key validity after fingerprint enrollment." 

This reverts commit ada0fc1b.

Change-Id: I934b6e6af49ab680af726c544f0193dfcb80054e
parent ada0fc1b

api/current.txt

+0 −5
Original line number Original line Diff line number Diff line
@@ -34092,7 +34092,6 @@ package android.security.keystore { 
    method public java.lang.String[] getSignaturePaddings();

    method public java.lang.String[] getSignaturePaddings();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isDigestsSpecified();

    method public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();
@@ -34110,7 +34109,6 @@ package android.security.keystore { 
    method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSubject(javax.security.auth.x500.X500Principal);

    method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSubject(javax.security.auth.x500.X500Principal);

    method public android.security.keystore.KeyGenParameterSpec.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setInvalidatedByBiometricEnrollment(boolean);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeySize(int);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeySize(int);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date);
@@ -34137,7 +34135,6 @@ package android.security.keystore { 
    method public java.lang.String[] getSignaturePaddings();

    method public java.lang.String[] getSignaturePaddings();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isInsideSecureHardware();

    method public boolean isInsideSecureHardware();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware();

    method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();
@@ -34201,7 +34198,6 @@ package android.security.keystore { 
    method public java.lang.String[] getSignaturePaddings();

    method public java.lang.String[] getSignaturePaddings();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isDigestsSpecified();

    method public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();
@@ -34213,7 +34209,6 @@ package android.security.keystore { 
    method public android.security.keystore.KeyProtection.Builder setBlockModes(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setBlockModes(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setInvalidatedByBiometricEnrollment(boolean);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);

api/system-current.txt

+0 −5
Original line number Original line Diff line number Diff line
@@ -36581,7 +36581,6 @@ package android.security.keystore { 
    method public java.lang.String[] getSignaturePaddings();

    method public java.lang.String[] getSignaturePaddings();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isDigestsSpecified();

    method public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();
@@ -36599,7 +36598,6 @@ package android.security.keystore { 
    method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSubject(javax.security.auth.x500.X500Principal);

    method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSubject(javax.security.auth.x500.X500Principal);

    method public android.security.keystore.KeyGenParameterSpec.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setInvalidatedByBiometricEnrollment(boolean);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeySize(int);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeySize(int);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date);
@@ -36626,7 +36624,6 @@ package android.security.keystore { 
    method public java.lang.String[] getSignaturePaddings();

    method public java.lang.String[] getSignaturePaddings();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isInsideSecureHardware();

    method public boolean isInsideSecureHardware();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware();

    method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();
@@ -36690,7 +36687,6 @@ package android.security.keystore { 
    method public java.lang.String[] getSignaturePaddings();

    method public java.lang.String[] getSignaturePaddings();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isDigestsSpecified();

    method public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();
@@ -36702,7 +36698,6 @@ package android.security.keystore { 
    method public android.security.keystore.KeyProtection.Builder setBlockModes(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setBlockModes(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setInvalidatedByBiometricEnrollment(boolean);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);

api/test-current.txt

+0 −5
Original line number Original line Diff line number Diff line
@@ -34107,7 +34107,6 @@ package android.security.keystore { 
    method public java.lang.String[] getSignaturePaddings();

    method public java.lang.String[] getSignaturePaddings();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isDigestsSpecified();

    method public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();
@@ -34125,7 +34124,6 @@ package android.security.keystore { 
    method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSubject(javax.security.auth.x500.X500Principal);

    method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSubject(javax.security.auth.x500.X500Principal);

    method public android.security.keystore.KeyGenParameterSpec.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyGenParameterSpec.Builder setInvalidatedByBiometricEnrollment(boolean);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeySize(int);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeySize(int);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date);

    method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date);
@@ -34152,7 +34150,6 @@ package android.security.keystore { 
    method public java.lang.String[] getSignaturePaddings();

    method public java.lang.String[] getSignaturePaddings();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isInsideSecureHardware();

    method public boolean isInsideSecureHardware();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware();

    method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();
@@ -34216,7 +34213,6 @@ package android.security.keystore { 
    method public java.lang.String[] getSignaturePaddings();

    method public java.lang.String[] getSignaturePaddings();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public int getUserAuthenticationValidityDurationSeconds();

    method public boolean isDigestsSpecified();

    method public boolean isDigestsSpecified();

    method public boolean isInvalidatedByBiometricEnrollment();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isRandomizedEncryptionRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationRequired();

    method public boolean isUserAuthenticationValidWhileOnBody();

    method public boolean isUserAuthenticationValidWhileOnBody();
@@ -34228,7 +34224,6 @@ package android.security.keystore { 
    method public android.security.keystore.KeyProtection.Builder setBlockModes(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setBlockModes(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...);

    method public android.security.keystore.KeyProtection.Builder setInvalidatedByBiometricEnrollment(boolean);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);

    method public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date);

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -234,8 +234,7 @@ public abstract class AndroidKeyStoreKeyGeneratorSpi extends KeyGeneratorSpi { 
                KeymasterUtils.addUserAuthArgs(new KeymasterArguments(),

                KeymasterUtils.addUserAuthArgs(new KeymasterArguments(),

                        spec.isUserAuthenticationRequired(),

                        spec.isUserAuthenticationRequired(),

                        spec.getUserAuthenticationValidityDurationSeconds(),

                        spec.getUserAuthenticationValidityDurationSeconds(),

                        spec.isUserAuthenticationValidWhileOnBody(),

                        spec.isUserAuthenticationValidWhileOnBody());

                        spec.isInvalidatedByBiometricEnrollment());

            } catch (IllegalStateException | IllegalArgumentException e) {

            } catch (IllegalStateException | IllegalArgumentException e) {

                throw new InvalidAlgorithmParameterException(e);

                throw new InvalidAlgorithmParameterException(e);

            }

            }
@@ -274,8 +273,7 @@ public abstract class AndroidKeyStoreKeyGeneratorSpi extends KeyGeneratorSpi { 
        KeymasterUtils.addUserAuthArgs(args,

        KeymasterUtils.addUserAuthArgs(args,

                spec.isUserAuthenticationRequired(),

                spec.isUserAuthenticationRequired(),

                spec.getUserAuthenticationValidityDurationSeconds(),

                spec.getUserAuthenticationValidityDurationSeconds(),

                spec.isUserAuthenticationValidWhileOnBody(),

                spec.isUserAuthenticationValidWhileOnBody());

                spec.isInvalidatedByBiometricEnrollment());

        KeymasterUtils.addMinMacLengthAuthorizationIfNecessary(

        KeymasterUtils.addMinMacLengthAuthorizationIfNecessary(

                args,

                args,

                mKeymasterAlgorithm,

                mKeymasterAlgorithm,

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -345,8 +345,7 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato 
                KeymasterUtils.addUserAuthArgs(new KeymasterArguments(),

                KeymasterUtils.addUserAuthArgs(new KeymasterArguments(),

                        mSpec.isUserAuthenticationRequired(),

                        mSpec.isUserAuthenticationRequired(),

                        mSpec.getUserAuthenticationValidityDurationSeconds(),

                        mSpec.getUserAuthenticationValidityDurationSeconds(),

                        mSpec.isUserAuthenticationValidWhileOnBody(),

                        mSpec.isUserAuthenticationValidWhileOnBody());

                        mSpec.isInvalidatedByBiometricEnrollment());

            } catch (IllegalArgumentException | IllegalStateException e) {

            } catch (IllegalArgumentException | IllegalStateException e) {

                throw new InvalidAlgorithmParameterException(e);

                throw new InvalidAlgorithmParameterException(e);

            }

            }
@@ -532,8 +531,7 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato 
        KeymasterUtils.addUserAuthArgs(args,

        KeymasterUtils.addUserAuthArgs(args,

                mSpec.isUserAuthenticationRequired(),

                mSpec.isUserAuthenticationRequired(),

                mSpec.getUserAuthenticationValidityDurationSeconds(),

                mSpec.getUserAuthenticationValidityDurationSeconds(),

                mSpec.isUserAuthenticationValidWhileOnBody(),

                mSpec.isUserAuthenticationValidWhileOnBody());

                mSpec.isInvalidatedByBiometricEnrollment());

        args.addDateIfNotNull(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, mSpec.getKeyValidityStart());

        args.addDateIfNotNull(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, mSpec.getKeyValidityStart());

        args.addDateIfNotNull(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME,

        args.addDateIfNotNull(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME,

                mSpec.getKeyValidityForOriginationEnd());

                mSpec.getKeyValidityForOriginationEnd());