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

am 457f0f5e: Merge "Move helper function to webkit"

Browse Source 
* commit '457f0f5e486c158bbe9816df39d2cbc52cec3b51':
  Move helper function to webkit
This commit is contained in:
Kenny Root
2013-09-12 23:35:13 -07:00
committed by Android Git Automerger
parent 4d73951a90 457f0f5e48
commit 753c1a3342
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.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;
import com.android.org.conscrypt.NativeCrypto;
import com.android.org.conscrypt.OpenSSLKey;
import com.android.org.conscrypt.OpenSSLKeyHolder;
@@ -48,12 +47,21 @@ public final class ClientCertRequestHandler extends Handler {
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.
*/
public void proceed(PrivateKey privateKey, X509Certificate[] chain) {
try {
byte[][] chainBytes = NativeCrypto.encodeCertificates(chain);
byte[][] chainBytes = encodeCertificates(chain);
mTable.Allow(mHostAndPort, privateKey, chainBytes);
if (privateKey instanceof OpenSSLKeyHolder) {