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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/mime_util.cc

Issue 11031043: Fix handling of user and CA certificates on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 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
« no previous file with comments | « net/base/cert_database_openssl.cc ('k') | net/base/openssl_private_key_store_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/mime_util.cc
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 35093da1f65d2da507378937e935b945a20e74fa..67a2415ca2f54c41d517b3f1d5b3cb660db66a3e 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -336,6 +336,10 @@ static const char* const supported_non_image_types[] = {
"application/xhtml+xml",
"application/json",
"application/x-x509-user-cert",
+#if defined(OS_ANDROID)
+ "application/x-x509-ca-cert",
+ "application/x-pkcs12",
+#endif
"multipart/related", // For MHTML support.
"multipart/x-mixed-replace"
// Note: ADDING a new type here will probably render it AS HTML. This can
« no previous file with comments | « net/base/cert_database_openssl.cc ('k') | net/base/openssl_private_key_store_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698