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

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

Issue 27500004: Listen for new system certificates. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Follow review Created 7 years, 2 months 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/SslUtil.java
diff --git a/android_webview/java/src/org/chromium/android_webview/SslUtil.java b/android_webview/java/src/org/chromium/android_webview/SslUtil.java
index 329cb1556908a87b5414a09a218a3e474008f772..5ab7e7943d6b7ab1acaa2048e9df0c990a0c2f77 100644
--- a/android_webview/java/src/org/chromium/android_webview/SslUtil.java
+++ b/android_webview/java/src/org/chromium/android_webview/SslUtil.java
@@ -4,6 +4,7 @@
package org.chromium.android_webview;
+import android.content.Context;
import android.net.http.SslCertificate;
import android.net.http.SslError;
import android.util.Log;
@@ -38,14 +39,14 @@ public class SslUtil {
return new SslError(SslError.SSL_INVALID, cert, url);
}
- public static SslCertificate getCertificateFromDerBytes(byte[] derBytes) {
+ public static SslCertificate getCertificateFromDerBytes(Context context, byte[] derBytes) {
if (derBytes == null) {
return null;
}
try {
X509Certificate x509Certificate =
- X509Util.createCertificateFromBytes(derBytes);
+ X509Util.createCertificateFromBytes(context, derBytes);
return new SslCertificate(x509Certificate);
} catch (CertificateException e) {
// A SSL related exception must have occured. This shouldn't happen.
@@ -59,4 +60,4 @@ public class SslUtil {
}
return null;
}
-}
+}

Powered by Google App Engine
This is Rietveld 408576698