Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68ebc129 authored by Max Bires's avatar Max Bires
Browse files

Fixing array cast. 

This fix properly casts the Certificate[] returned by KeyStore to an
X509Certificate.

Bug: 182825370
Test: atest GtsGmscoreHostTestCases
Change-Id: If1e7cbbe612217b92067f76f8d13d1a0002e1579
parent 4cc71277

keystore/java/android/security/keystore/AttestationUtils.java

+4 −1
Original line number Diff line number Diff line
@@ -36,9 +36,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;
@@ -281,8 +283,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);