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

Commit ce410500 authored by Android Git Automerger's avatar Android Git Automerger
Browse files

resolved conflicts for merge of 4d4229e4 to master

parents e712ee3f 4d4229e4

core/java/android/webkit/LoadListener.java

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

    }

core/java/android/webkit/MimeTypeMap.java

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

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);