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

Unified Diff: net/android/java/src/org/chromium/net/AndroidNetworkLibrary.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: net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
index 49b66345c7a355da6cbba811cac3b9a34109aa1d..ceafb6465f379caac3a252b3da67e1f3438fa706 100644
--- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
+++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
@@ -203,9 +203,10 @@ class AndroidNetworkLibrary {
* @return Android certificate verification result code.
*/
@CalledByNative
- public static int verifyServerCertificates(byte[][] certChain, String authType) {
+ public static int verifyServerCertificates(Context context, byte[][] certChain,
+ String authType) {
try {
- return X509Util.verifyServerCertificates(certChain, authType);
+ return X509Util.verifyServerCertificates(context, certChain, authType);
} catch (KeyStoreException e) {
return CertVerifyResultAndroid.VERIFY_FAILED;
} catch (NoSuchAlgorithmException e) {
@@ -218,9 +219,9 @@ class AndroidNetworkLibrary {
* @param rootCert DER encoded bytes of the certificate.
*/
@CalledByNativeUnchecked
- public static void addTestRootCertificate(byte[] rootCert) throws CertificateException,
- KeyStoreException, NoSuchAlgorithmException {
- X509Util.addTestRootCertificate(rootCert);
+ public static void addTestRootCertificate(Context context, byte[] rootCert)
+ throws CertificateException, KeyStoreException, NoSuchAlgorithmException {
+ X509Util.addTestRootCertificate(context, rootCert);
}
/**
@@ -228,8 +229,8 @@ class AndroidNetworkLibrary {
* trust store.
*/
@CalledByNativeUnchecked
- public static void clearTestRootCertificates() throws NoSuchAlgorithmException,
+ public static void clearTestRootCertificates(Context context) throws NoSuchAlgorithmException,
CertificateException, KeyStoreException {
- X509Util.clearTestRootCertificates();
+ X509Util.clearTestRootCertificates(context);
}
}

Powered by Google App Engine
This is Rietveld 408576698