Upstream: Build net_unittests for Android.

net/base/x509_certificate_openssl_android.cc

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..c0433290d07d195c92ca545c306079aafd8246ea 100644
--- a/net/base/x509_certificate_openssl_android.cc
+++ b/net/base/x509_certificate_openssl_android.cc
@@ -12,6 +12,14 @@
 
 namespace net {
 
+struct DERCache {

[John Grabowski, 2011/11/01 23:09:34]

Hmm where do other platforms pick this up?

[Jing Zhao, 2011/11/02 16:22:55]

It was only used in net/base/x509_certificate_openssl.cc. Should I move it to
net/base/x509_certificate.h, like what I already did?

[John Grabowski, 2011/11/02 22:18:16]

Per subsequent follow-up, follow joth's instructions.

+  unsigned char* data;
+  int data_length;
+};
+
+bool GetDERAndCacheIfNeeded(X509Certificate::OSCertHandle cert,
+                            DERCache* der_cache);
+
 int X509Certificate::VerifyInternal(const std::string& hostname,
                                     int flags,
                                     CRLSet* crl_set,
@@ -23,7 +31,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.

[John Grabowski, 2011/11/01 23:09:34]

ditto on doc

[Jing Zhao, 2011/11/02 16:22:55]

Done.

+  /*android::VerifyResult result =
       android::VerifyX509CertChain(cert_bytes, hostname, "RSA");
   switch (result) {
     case android::VERIFY_OK:
@@ -38,7 +47,7 @@ int X509Certificate::VerifyInternal(const std::string& hostname,
     default:
       verify_result->cert_status |= ERR_CERT_INVALID;
       break;
-  }
+  }*/
   return MapCertStatusToNetError(verify_result->cert_status);
 }