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

Merge "Fixing engineGetCertificateChain exception"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-19 03:02:31 +00:00
committed by Gerrit Code Review
parent 36459170a7 beae8c67dc
commit 09e3d8c3eb
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
View File

@@ -16,7 +16,6 @@
package android.security.keystore; package android.security.keystore;
import libcore.util.EmptyArray;
import android.security.Credentials; import android.security.Credentials;
import android.security.GateKeeper; import android.security.GateKeeper;
import android.security.KeyStore; import android.security.KeyStore;
@@ -31,6 +30,8 @@ import android.security.keystore.SecureKeyImportUnavailableException;
import android.security.keystore.WrappedKeyEntry; import android.security.keystore.WrappedKeyEntry;
import android.util.Log; import android.util.Log;
import libcore.util.EmptyArray;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@@ -123,7 +124,14 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
final Certificate[] caList; final Certificate[] caList;
final byte[] caBytes = mKeyStore.get(Credentials.CA_CERTIFICATE + alias, mUid); // Suppress the key not found warning for this call. It seems that this error is exclusively
// being thrown when there is a self signed certificate chain, so when the keystore service
// attempts to query for the CA details, it obviously fails to find them and returns a
// key not found exception. This is WAI, and throwing a stack trace here can be very
// misleading since the trace is not clear.
final byte[] caBytes = mKeyStore.get(Credentials.CA_CERTIFICATE + alias,
mUid,
true /* suppressKeyNotFoundWarning */);
if (caBytes != null) { if (caBytes != null) {
final Collection<X509Certificate> caChain = toCertificates(caBytes); final Collection<X509Certificate> caChain = toCertificates(caBytes);