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

am ca731c5c: am c0c394ee: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0

Browse Source 
* commit 'ca731c5c6beb031383e661d1f09730ba1877f457':
  Modify BrowserFrame.requestClientCert() to take the host and port as a String
This commit is contained in:
Steve Block
2011-10-12 19:38:41 -07:00
committed by Android Git Automerger
parent 90c6bef4ab ca731c5c6b
commit a36314e477
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/webkit/BrowserFrame.java
View File

@@ -1204,22 +1204,20 @@ class BrowserFrame extends Handler {
* We delegate the request to CallbackProxy, and route its response to
* {@link #nativeSslClientCert(int, X509Certificate)}.
*/
private void requestClientCert(int handle, byte[] host_and_port_bytes) {
String host_and_port = new String(host_and_port_bytes, Charsets.UTF_8);
private void requestClientCert(int handle, String hostAndPort) {
SslClientCertLookupTable table = SslClientCertLookupTable.getInstance();
if (table.IsAllowed(host_and_port)) {
if (table.IsAllowed(hostAndPort)) {
// previously allowed
nativeSslClientCert(handle,
table.PrivateKey(host_and_port),
table.CertificateChain(host_and_port));
} else if (table.IsDenied(host_and_port)) {
table.PrivateKey(hostAndPort),
table.CertificateChain(hostAndPort));
} else if (table.IsDenied(hostAndPort)) {
// previously denied
nativeSslClientCert(handle, null, null);
} else {
// previously ignored or new
mCallbackProxy.onReceivedClientCertRequest(
new ClientCertRequestHandler(this, handle, host_and_port, table),
host_and_port);
new ClientCertRequestHandler(this, handle, hostAndPort, table), hostAndPort);
}
}