commit d1399070b9749d1a70f18426d1c668cf3070d7ec
author Android (Google) Code Review <android-gerrit@google.com> Wed Jul 29 16:43:38 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 29 16:43:38 2009 -0700
tree c99457a8f9c51853a4e82da9d22457241044bf5a
parent ce4105002310a22e104d29d56913cbca9cd485be
parent 2d9c9e3f6780b70fc98cfa0102824308e8ed28e9

Merge change 9052

* changes:
  Less log spew.

core/java/android/webkit/LoadListener.java

diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java
index 3da5a3c..50436d8 100644
--- a/core/java/android/webkit/LoadListener.java
+++ b/core/java/android/webkit/LoadListener.java
@@ -74,6 +74,7 @@
     static {
         sCertificateMimeTypeMap = new HashSet<String>();
         sCertificateMimeTypeMap.add("application/x-x509-ca-cert");
+        sCertificateMimeTypeMap.add("application/x-x509-user-cert");
         sCertificateMimeTypeMap.add("application/x-pkcs12");
     }
 

core/java/android/webkit/MimeTypeMap.java

diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java
index b2aa524..a55dbc8 100644
--- a/core/java/android/webkit/MimeTypeMap.java
+++ b/core/java/android/webkit/MimeTypeMap.java
@@ -330,6 +330,7 @@
             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");

keystore/java/android/security/CertTool.java

diff --git a/keystore/java/android/security/CertTool.java b/keystore/java/android/security/CertTool.java
index 1de007d..b1b78ea 100644
--- a/keystore/java/android/security/CertTool.java
+++ b/keystore/java/android/security/CertTool.java
@@ -140,7 +140,7 @@
 
     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);
     }
 

keystore/jni/cert.c

diff --git a/keystore/jni/cert.c b/keystore/jni/cert.c
index ea21b7d..006a0a3 100644
--- a/keystore/jni/cert.c
+++ b/keystore/jni/cert.c
@@ -46,7 +46,7 @@
     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);