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

Unified Diff: net/base/cert_verify_proc_openssl.cc

Issue 10171009: Update net/android/network_library.cc with fresher code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added comments, fixed caller Created 8 years, 8 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/base/cert_verify_proc_openssl.cc
diff --git a/net/base/cert_verify_proc_openssl.cc b/net/base/cert_verify_proc_openssl.cc
index a01bb44553cccf6103472173c413644549bf7086..b9bca56ce2bc2593948ebbd1b6a9845d98ec2b8b 100644
--- a/net/base/cert_verify_proc_openssl.cc
+++ b/net/base/cert_verify_proc_openssl.cc
@@ -159,22 +159,12 @@ void AppendPublicKeyHashes(X509_STORE_CTX* store_ctx,
bool VerifyFromAndroidTrustManager(const std::vector<std::string>& cert_bytes,
CertVerifyResult* verify_result) {
// TODO(joth): Fetch the authentication type from SSL rather than hardcode.
- // TODO(jnd): Remove unused |hostname| from net::android::VerifyX509CertChain.
bool verified = true;
-#if 0
android::VerifyResult result =
- android::VerifyX509CertChain(cert_bytes, hostname, "RSA");
-#else
- // TODO(jingzhao): Recover the original implementation once we support JNI.
- android::VerifyResult result = android::VERIFY_INVOCATION_ERROR;
- NOTIMPLEMENTED();
-#endif
+ android::VerifyX509CertChain(cert_bytes, "RSA");
switch (result) {
case android::VERIFY_OK:
break;
- case android::VERIFY_BAD_HOSTNAME:
- verify_result->cert_status |= CERT_STATUS_COMMON_NAME_INVALID;
- break;
case android::VERIFY_NO_TRUSTED_ROOT:
verify_result->cert_status |= CERT_STATUS_AUTHORITY_INVALID;
break;

Powered by Google App Engine
This is Rietveld 408576698