diff options
| author | Janis Danisevskis <jdanis@google.com> | 2018-11-16 14:55:26 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-16 14:55:26 -0800 |
| commit | 28b8cd58cae36430ed4ab77467814b11cf57f89e (patch) | |
| tree | 33930be43e038cd76d737743c50e71cc12ccdcd8 /keystore/java/android/security/KeyStore.java | |
| parent | a3e159a48079253242a8c026835da571ab2e8dc9 (diff) | |
| parent | e73f8e8827502d2f29a569788e74715b7c1a3d12 (diff) | |
Merge "Fix IllegalArgumentException in KeyChain" am: 932f96b27f
am: e73f8e8827
Change-Id: I3b779c5456525d4980284baa532eafb415695b47
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index 40570c1083b3..e1c1138fe52d 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -55,6 +55,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.security.InvalidKeyException; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Locale; import java.util.concurrent.CompletableFuture; @@ -688,11 +689,9 @@ public class KeyStore { args.addEnum(KeymasterDefs.KM_TAG_DIGEST, KeymasterDefs.KM_DIGEST_SHA_2_384); args.addEnum(KeymasterDefs.KM_TAG_DIGEST, KeymasterDefs.KM_DIGEST_SHA_2_512); args.addBoolean(KeymasterDefs.KM_TAG_NO_AUTH_REQUIRED); - args.addUnsignedLong(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME, - KeymasterArguments.UINT64_MAX_VALUE); - args.addUnsignedLong(KeymasterDefs.KM_TAG_USAGE_EXPIRE_DATETIME, - KeymasterArguments.UINT64_MAX_VALUE); - args.addUnsignedLong(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, BigInteger.ZERO); + args.addDate(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME, new Date(Long.MAX_VALUE)); + args.addDate(KeymasterDefs.KM_TAG_USAGE_EXPIRE_DATETIME, new Date(Long.MAX_VALUE)); + args.addDate(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, new Date(0)); return args; } |