diff options
| -rw-r--r-- | keystore/java/android/security/keystore/AttestationUtils.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/keystore/java/android/security/keystore/AttestationUtils.java b/keystore/java/android/security/keystore/AttestationUtils.java index ec3b102c5af9..66d842ec5614 100644 --- a/keystore/java/android/security/keystore/AttestationUtils.java +++ b/keystore/java/android/security/keystore/AttestationUtils.java @@ -34,9 +34,11 @@ import java.nio.charset.StandardCharsets; import java.security.KeyPairGenerator; import java.security.KeyStore; import java.security.SecureRandom; +import java.security.cert.Certificate; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.security.spec.ECGenParameterSpec; +import java.util.Arrays; import java.util.Collection; import java.util.Random; import java.util.Set; @@ -248,8 +250,9 @@ public abstract class AttestationUtils { KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore"); keyStore.load(null); + Certificate[] certs = keyStore.getCertificateChain(keystoreAlias); X509Certificate[] certificateChain = - (X509Certificate[]) keyStore.getCertificateChain(keystoreAlias); + Arrays.copyOf(certs, certs.length, X509Certificate[].class); keyStore.deleteEntry(keystoreAlias); |