Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 8757 into donut

Browse Source 
* changes:
  Support x509-user-cert mime type in browser.
This commit is contained in:
Android (Google) Code Review
2009-07-28 18:34:33 -07:00
parent 67897b1af7 fd3db87e28
commit 4d4229e4d9
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/webkit/LoadListener.java
View File

@@ -76,6 +76,7 @@ class LoadListener extends Handler implements EventHandler {
static { static {
sCertificateMimeTypeMap = new HashSet<String>(); sCertificateMimeTypeMap = new HashSet<String>();
sCertificateMimeTypeMap.add("application/x-x509-ca-cert"); sCertificateMimeTypeMap.add("application/x-x509-ca-cert");
sCertificateMimeTypeMap.add("application/x-x509-user-cert");
sCertificateMimeTypeMap.add("application/x-pkcs12"); sCertificateMimeTypeMap.add("application/x-pkcs12");
} }

1
core/java/android/webkit/MimeTypeMap.java
View File

@@ -357,6 +357,7 @@ public /* package */ class MimeTypeMap {
sMimeTypeMap.loadEntry( sMimeTypeMap.loadEntry(
"application/x-webarchive", "webarchive", false); // added "application/x-webarchive", "webarchive", false); // added
sMimeTypeMap.loadEntry("application/x-x509-ca-cert", "crt", false); sMimeTypeMap.loadEntry("application/x-x509-ca-cert", "crt", false);
sMimeTypeMap.loadEntry("application/x-x509-user-cert", "crt", false);
sMimeTypeMap.loadEntry("application/x-xcf", "xcf", false); sMimeTypeMap.loadEntry("application/x-xcf", "xcf", false);
sMimeTypeMap.loadEntry("application/x-xfig", "fig", false); sMimeTypeMap.loadEntry("application/x-xfig", "fig", false);
sMimeTypeMap.loadEntry("audio/basic", "snd", false); sMimeTypeMap.loadEntry("audio/basic", "snd", false);

2
keystore/java/android/security/CertTool.java
View File

@@ -140,7 +140,7 @@ public class CertTool {
private void addExtraIntentInfo(Intent intent, String namespace, private void addExtraIntentInfo(Intent intent, String namespace,
String data) { String data) {
intent.putExtra(KEY_ITEM + "1", data); intent.putExtra(KEY_ITEM + "1", data.getBytes());
intent.putExtra(KEY_NAMESPACE + "1", namespace); intent.putExtra(KEY_NAMESPACE + "1", namespace);
} }

2
keystore/jni/cert.c
View File

@@ -46,7 +46,7 @@ static void save_in_store(EVP_PKEY *pkey)
RSA *rsa = EVP_PKEY_get1_RSA(pkey); RSA *rsa = EVP_PKEY_get1_RSA(pkey);
EVP_PKEY_set1_RSA(newpkey, rsa); EVP_PKEY_set1_RSA(newpkey, rsa);
PKEY_STORE_free(pkey_store[store_index]); 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; pkey_store[store_index++].pkey = newpkey;
store_index %= KEYGEN_STORE_SIZE; store_index %= KEYGEN_STORE_SIZE;
RSA_free(rsa); RSA_free(rsa);