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

Unified Diff: net/base/x509_certificate_openssl_android.cc

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: address comments Created 9 years, 1 month 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/x509_certificate_openssl_android.cc
diff --git a/net/base/x509_certificate_openssl_android.cc b/net/base/x509_certificate_openssl_android.cc
index fa01c5737bee90a57bca247711c8487914468612..453178195e82ed76db85aa74d77971977e63465f 100644
--- a/net/base/x509_certificate_openssl_android.cc
+++ b/net/base/x509_certificate_openssl_android.cc
@@ -23,7 +23,8 @@ int X509Certificate::VerifyInternal(const std::string& hostname,
GetChainDEREncodedBytes(&cert_bytes);
// TODO(joth): Fetch the authentication type from SSL rather than hardcode.
- android::VerifyResult result =
+ // TODO(jingzhao): Uncomment the following code once we support JNI.
+ /*android::VerifyResult result =
android::VerifyX509CertChain(cert_bytes, hostname, "RSA");
joth 2011/11/02 18:57:05 just #if 0 out this one line, and in the #else ini
Jing Zhao 2011/11/03 17:49:08 Done.
switch (result) {
case android::VERIFY_OK:
@@ -38,7 +39,7 @@ int X509Certificate::VerifyInternal(const std::string& hostname,
default:
verify_result->cert_status |= ERR_CERT_INVALID;
break;
- }
+ }*/
return MapCertStatusToNetError(verify_result->cert_status);
}

Powered by Google App Engine
This is Rietveld 408576698