Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd3db87e authored by Chung-yih Wang's avatar Chung-yih Wang
Browse files

Support x509-user-cert mime type in browser. 

+ Fix the public key matching and intent parameter mismatch.
parent 19145237

core/java/android/webkit/LoadListener.java

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,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");

    }

core/java/android/webkit/MimeTypeMap.java

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ public /* package */ class MimeTypeMap { 
            sMimeTypeMap.loadEntry(

                    "application/x-webarchive", "webarchive", false); // added

            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-xfig", "fig", false);

            sMimeTypeMap.loadEntry("audio/basic", "snd", false);

keystore/java/android/security/CertTool.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

keystore/jni/cert.c

+1 −1
Original line number Diff line number Diff line
@@ -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);