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

Unified Diff: net/base/cert_database_openssl.cc

Issue 11266008: Fix certificate and keychain installation on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rename CertificateType to CertificateMimeType Created 8 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/cert_database_openssl.cc
diff --git a/net/base/cert_database_openssl.cc b/net/base/cert_database_openssl.cc
index 7459b078c8868a1bcdedd173e00dda15b96aa093..bd67a56730c6dddc38112135ee150b0cced86189 100644
--- a/net/base/cert_database_openssl.cc
+++ b/net/base/cert_database_openssl.cc
@@ -22,6 +22,18 @@ CertDatabase::CertDatabase()
CertDatabase::~CertDatabase() {}
int CertDatabase::CheckUserCert(X509Certificate* cert) {
+#if defined(OS_ANDROID)
+// NOTE: This method shall never be called on Android.
+//
+// On other platforms, it is only used by the SSLAddCertHandler class
+// to handle veritication and installation of downloaded certificates.
+//
+// On Android, the certificate data is passed directly to the system's
+// CertInstaller activity, which handles verification, naming,
+// installation and UI (for success/failure).
+ NOTIMPLEMENTED();
+ return ERR_NOT_IMPLEMENTED;
+#else // OS_ANDROID
if (!cert)
return ERR_CERT_INVALID;
if (cert->HasExpired())
@@ -32,10 +44,10 @@ int CertDatabase::CheckUserCert(X509Certificate* cert) {
return ERR_NO_PRIVATE_KEY_FOR_CERT;
return OK;
+#endif // OS_ANDROID
}
int CertDatabase::AddUserCert(X509Certificate* cert) {
- // TODO(bulach): implement me.
NOTIMPLEMENTED();
return ERR_NOT_IMPLEMENTED;
}
« no previous file with comments | « net/android/network_library.cc ('k') | net/base/mime_util.h » ('j') | net/base/mime_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698