drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move helper function to webkit"

Browse Source
This commit is contained in:
Kenny Root
2013-09-13 06:30:53 +00:00
committed by Gerrit Code Review
parent c286ae17a0 cb4317a5a7
commit 457f0f5e48
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/webkit/ClientCertRequestHandler.java
View File

@ -20,7 +20,6 @@ import android.os.Handler;
import java.security.PrivateKey; import java.security.PrivateKey;
import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import com.android.org.conscrypt.NativeCrypto;
import com.android.org.conscrypt.OpenSSLKey; import com.android.org.conscrypt.OpenSSLKey;
import com.android.org.conscrypt.OpenSSLKeyHolder; import com.android.org.conscrypt.OpenSSLKeyHolder;
@ -48,12 +47,21 @@ public final class ClientCertRequestHandler extends Handler {
mTable = table; mTable = table;
} }
private static byte[][] encodeCertificates(X509Certificate[] certificates)
throws CertificateEncodingException {
byte[][] certificateBytes = new byte[certificates.length][];
for (int i = 0; i < certificates.length; i++) {
certificateBytes[i] = certificates[i].getEncoded();
}
return certificateBytes;
}
/** /**
* Proceed with the specified private key and client certificate chain. * Proceed with the specified private key and client certificate chain.
*/ */
public void proceed(PrivateKey privateKey, X509Certificate[] chain) { public void proceed(PrivateKey privateKey, X509Certificate[] chain) {
try { try {
byte[][] chainBytes = NativeCrypto.encodeCertificates(chain); byte[][] chainBytes = encodeCertificates(chain);
mTable.Allow(mHostAndPort, privateKey, chainBytes); mTable.Allow(mHostAndPort, privateKey, chainBytes);
if (privateKey instanceof OpenSSLKeyHolder) { if (privateKey instanceof OpenSSLKeyHolder) {