diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java
index 3da5a3c65be8f..50436d87bfde4 100644
--- a/core/java/android/webkit/LoadListener.java
+++ b/core/java/android/webkit/LoadListener.java
@@ -74,6 +74,7 @@ class LoadListener extends Handler implements EventHandler {
     static {
         sCertificateMimeTypeMap = new HashSet<String>();
         sCertificateMimeTypeMap.add("application/x-x509-ca-cert");
+        sCertificateMimeTypeMap.add("application/x-x509-user-cert");
         sCertificateMimeTypeMap.add("application/x-pkcs12");
     }
 
diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java
index b2aa524ede6d6..a55dbc890f5aa 100644
--- a/core/java/android/webkit/MimeTypeMap.java
+++ b/core/java/android/webkit/MimeTypeMap.java
@@ -330,6 +330,7 @@ public class MimeTypeMap {
             sMimeTypeMap.loadEntry("application/x-wingz", "wz");
             sMimeTypeMap.loadEntry("application/x-webarchive", "webarchive");
             sMimeTypeMap.loadEntry("application/x-x509-ca-cert", "crt");
+            sMimeTypeMap.loadEntry("application/x-x509-user-cert", "crt");
             sMimeTypeMap.loadEntry("application/x-xcf", "xcf");
             sMimeTypeMap.loadEntry("application/x-xfig", "fig");
             sMimeTypeMap.loadEntry("application/xhtml+xml", "xhtml");
diff --git a/keystore/java/android/security/CertTool.java b/keystore/java/android/security/CertTool.java
index 1de007db1b5ec..b1b78ea963626 100644
--- a/keystore/java/android/security/CertTool.java
+++ b/keystore/java/android/security/CertTool.java
@@ -140,7 +140,7 @@ public class CertTool {
 
     private void addExtraIntentInfo(Intent intent, String namespace,
             String data) {
-        intent.putExtra(KEY_ITEM + "1", data);
+        intent.putExtra(KEY_ITEM + "1", data.getBytes());
         intent.putExtra(KEY_NAMESPACE + "1", namespace);
     }
 
diff --git a/keystore/jni/cert.c b/keystore/jni/cert.c
index ea21b7d062d17..006a0a3512586 100644
--- a/keystore/jni/cert.c
+++ b/keystore/jni/cert.c
@@ -46,7 +46,7 @@ static void save_in_store(EVP_PKEY *pkey)
     RSA *rsa = EVP_PKEY_get1_RSA(pkey);
     EVP_PKEY_set1_RSA(newpkey, rsa);
     PKEY_STORE_free(pkey_store[store_index]);
-    pkey_store[store_index].key_len = i2d_RSAPublicKey(rsa, &pkey_store[store_index].public_key);
+    pkey_store[store_index].key_len = i2d_RSA_PUBKEY(rsa, &pkey_store[store_index].public_key);
     pkey_store[store_index++].pkey = newpkey;
     store_index %= KEYGEN_STORE_SIZE;
     RSA_free(rsa);