diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-23 20:35:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 20:35:30 +0000 |
| commit | 90c9e4eb54a9c4b4fbc821b1992f2aee2f2b1e8c (patch) | |
| tree | 3adda6bc46dacb89715e293c6c9f285bdc80e1a9 /keystore/java/android/security/keystore/AndroidKeyStoreSecretKeyFactorySpi.java | |
| parent | f1b25bd43464b2603da98ce5f03f41d9819d2374 (diff) | |
| parent | d6c7799b9a8b00d160a1d2d32c7326132cbc7b7b (diff) | |
| download | frameworks_base-90c9e4eb54a9c4b4fbc821b1992f2aee2f2b1e8c.zip frameworks_base-90c9e4eb54a9c4b4fbc821b1992f2aee2f2b1e8c.tar.gz frameworks_base-90c9e4eb54a9c4b4fbc821b1992f2aee2f2b1e8c.tar.bz2 | |
Merge "Keymaster key validity dates are optional." into mnc-dev
Diffstat (limited to 'keystore/java/android/security/keystore/AndroidKeyStoreSecretKeyFactorySpi.java')
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreSecretKeyFactorySpi.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSecretKeyFactorySpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSecretKeyFactorySpi.java index 8b00821..7887923 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreSecretKeyFactorySpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreSecretKeyFactorySpi.java @@ -147,21 +147,10 @@ public class AndroidKeyStoreSecretKeyFactorySpi extends SecretKeyFactorySpi { } Date keyValidityStart = keyCharacteristics.getDate(KeymasterDefs.KM_TAG_ACTIVE_DATETIME); - if ((keyValidityStart != null) && (keyValidityStart.getTime() <= 0)) { - keyValidityStart = null; - } Date keyValidityForOriginationEnd = keyCharacteristics.getDate(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME); - if ((keyValidityForOriginationEnd != null) - && (keyValidityForOriginationEnd.getTime() == Long.MAX_VALUE)) { - keyValidityForOriginationEnd = null; - } Date keyValidityForConsumptionEnd = keyCharacteristics.getDate(KeymasterDefs.KM_TAG_USAGE_EXPIRE_DATETIME); - if ((keyValidityForConsumptionEnd != null) - && (keyValidityForConsumptionEnd.getTime() == Long.MAX_VALUE)) { - keyValidityForConsumptionEnd = null; - } boolean userAuthenticationRequired = !keyCharacteristics.getBoolean(KeymasterDefs.KM_TAG_NO_AUTH_REQUIRED); int userAuthenticationValidityDurationSeconds = |