diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 22:08:08 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 22:08:08 +0000 |
| commit | 0eaabe17baa549a9212a4fba6200315d93828b71 (patch) | |
| tree | bd5bf99106795e1968b0fcf91e8354395ff1f7ff /net/android/network_library.cc | |
| parent | 9390057f1fee7ee2dc7d507b7e5d554335bf48e2 (diff) | |
| download | chromium_src-0eaabe17baa549a9212a4fba6200315d93828b71.zip chromium_src-0eaabe17baa549a9212a4fba6200315d93828b71.tar.gz chromium_src-0eaabe17baa549a9212a4fba6200315d93828b71.tar.bz2 | |
Follow-up changes to Android certificate verification logic.
- Handle devices without an "AndroidCAStore" KeyStore. Add a histogram to
record when this happens.
- Remove resolved TODO.
- Unnecessary exception check (relevant function already CalledByNative, not
CalledByNativeUnchecked)
BUG=116838
TEST=none
Review URL: https://codereview.chromium.org/144153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android/network_library.cc')
| -rw-r--r-- | net/android/network_library.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/android/network_library.cc b/net/android/network_library.cc index 37ab18e..ea9ec4a4 100644 --- a/net/android/network_library.cc +++ b/net/android/network_library.cc @@ -12,7 +12,6 @@ #include "jni/AndroidNetworkLibrary_jni.h" using base::android::AttachCurrentThread; -using base::android::ClearException; using base::android::ConvertJavaStringToUTF8; using base::android::ConvertUTF8ToJavaString; using base::android::GetApplicationContext; @@ -46,10 +45,6 @@ void VerifyX509CertChain(const std::vector<std::string>& cert_chain, ScopedJavaLocalRef<jobject> result = Java_AndroidNetworkLibrary_verifyServerCertificates( env, chain_byte_array.obj(), auth_string.obj(), host_string.obj()); - if (ClearException(env)) { - *status = android::VERIFY_FAILED; - return; - } ExtractCertVerifyResult(result.obj(), status, is_issued_by_known_root, verified_chain); |