| 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;
|
| }
|
| -}
|
| +}
|
|
|