Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: android_webview/java/src/org/chromium/android_webview/ClientCertLookupTable.java

Issue 1474603004: Remove Android support for out-of-process KeyStores (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated comments Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/java/src/org/chromium/android_webview/ClientCertLookupTable.java
diff --git a/android_webview/java/src/org/chromium/android_webview/ClientCertLookupTable.java b/android_webview/java/src/org/chromium/android_webview/ClientCertLookupTable.java
index 88e6ed1408ef1976330b46e06120ef77707801fb..388f19dab47a4a7f4aaae66d489e6833fc5c400a 100644
--- a/android_webview/java/src/org/chromium/android_webview/ClientCertLookupTable.java
+++ b/android_webview/java/src/org/chromium/android_webview/ClientCertLookupTable.java
@@ -4,8 +4,7 @@
package org.chromium.android_webview;
-import org.chromium.net.AndroidPrivateKey;
-
+import java.security.PrivateKey;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -22,9 +21,9 @@ public class ClientCertLookupTable {
* A container for the certificate data.
*/
public static class Cert {
- AndroidPrivateKey mPrivateKey;
+ PrivateKey mPrivateKey;
byte[][] mCertChain;
- public Cert(AndroidPrivateKey privateKey, byte[][] certChain) {
+ public Cert(PrivateKey privateKey, byte[][] certChain) {
this.mPrivateKey = privateKey;
byte[][] newChain = new byte[certChain.length][];
for (int i = 0; i < certChain.length; i++) {
@@ -48,7 +47,7 @@ public class ClientCertLookupTable {
mDenieds = new HashSet<String>();
}
- public void allow(String host, int port, AndroidPrivateKey privateKey, byte[][] chain) {
+ public void allow(String host, int port, PrivateKey privateKey, byte[][] chain) {
String host_and_port = hostAndPort(host, port);
mCerts.put(host_and_port, new Cert(privateKey, chain));
mDenieds.remove(host_and_port);

Powered by Google App Engine
This is Rietveld 408576698