diff options
| author | Janis Danisevskis <jdanis@google.com> | 2018-11-16 15:18:16 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-16 15:18:16 -0800 |
| commit | e299490621edadf52e9f820670cb1cc9f01c99b7 (patch) | |
| tree | 6869a071822aad776655800f33d4f0dd0265fd4e | |
| parent | 86e1d8f3070185a4905d50e2f09528c3b339c243 (diff) | |
| parent | 28b8cd58cae36430ed4ab77467814b11cf57f89e (diff) | |
Merge "Fix IllegalArgumentException in KeyChain" am: 932f96b27f am: e73f8e8827
am: 28b8cd58ca
Change-Id: I327e931490d3d81b824b134795a57add7c257c74
| -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 fec800dcb306..6d58d95e6fb6 100644 --- a/keystore/java/android/security/KeyStore.java +++ b/keystore/java/android/security/KeyStore.java @@ -56,6 +56,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; @@ -700,11 +701,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; } |