Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing array cast." am: caa4617084 am: 4737ee5fa4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649541

Change-Id: I8db0d4b1bbc8a0932bbe1a6221bef3b8e845b2dc
This commit is contained in:
Max Bires
2021-04-06 01:51:31 +00:00
committed by Automerger Merge Worker
parent 34b2e597c7 4737ee5fa4
commit ce59601017
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystore/java/android/security/keystore/AttestationUtils.java
View File

@@ -36,9 +36,11 @@ import java.nio.charset.StandardCharsets;
import java.security.KeyPairGenerator; import java.security.KeyPairGenerator;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory; import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.security.spec.ECGenParameterSpec; import java.security.spec.ECGenParameterSpec;
import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
@@ -281,8 +283,9 @@ public abstract class AttestationUtils {
KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore"); KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null); keyStore.load(null);
Certificate[] certs = keyStore.getCertificateChain(keystoreAlias);
X509Certificate[] certificateChain = X509Certificate[] certificateChain =
(X509Certificate[]) keyStore.getCertificateChain(keystoreAlias); Arrays.copyOf(certs, certs.length, X509Certificate[].class);
keyStore.deleteEntry(keystoreAlias); keyStore.deleteEntry(keystoreAlias);