From aa6c3c3e252252b80c3900bd4c1ff27d37265c6d Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Fri, 18 Dec 2015 13:43:28 -0800 Subject: Support TrustedCertificateStore.findAllIssuers Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46 --- .../security/net/config/TestCertificateSource.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'tests/NetworkSecurityConfigTest') diff --git a/tests/NetworkSecurityConfigTest/src/android/security/net/config/TestCertificateSource.java b/tests/NetworkSecurityConfigTest/src/android/security/net/config/TestCertificateSource.java index 0c360631c294..4c12c2d5da7c 100644 --- a/tests/NetworkSecurityConfigTest/src/android/security/net/config/TestCertificateSource.java +++ b/tests/NetworkSecurityConfigTest/src/android/security/net/config/TestCertificateSource.java @@ -16,8 +16,9 @@ package android.security.net.config; -import java.util.Set; +import android.util.ArraySet; import java.security.cert.X509Certificate; +import java.util.Set; import com.android.org.conscrypt.TrustedCertificateIndex; @@ -33,10 +34,12 @@ public class TestCertificateSource implements CertificateSource { } } + @Override public Set getCertificates() { return mCertificates; } + @Override public X509Certificate findBySubjectAndPublicKey(X509Certificate cert) { java.security.cert.TrustAnchor anchor = mIndex.findBySubjectAndPublicKey(cert); if (anchor == null) { @@ -45,6 +48,7 @@ public class TestCertificateSource implements CertificateSource { return anchor.getTrustedCert(); } + @Override public X509Certificate findByIssuerAndSignature(X509Certificate cert) { java.security.cert.TrustAnchor anchor = mIndex.findByIssuerAndSignature(cert); if (anchor == null) { @@ -52,4 +56,13 @@ public class TestCertificateSource implements CertificateSource { } return anchor.getTrustedCert(); } + + @Override + public Set findAllByIssuerAndSignature(X509Certificate cert) { + Set certs = new ArraySet(); + for (java.security.cert.TrustAnchor anchor : mIndex.findAllByIssuerAndSignature(cert)) { + certs.add(anchor.getTrustedCert()); + } + return certs; + } } -- cgit v1.2.3-59-g8ed1b