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

Commit b50b15cd authored by Kenny Root's avatar Kenny Root
Browse files

Convert to new KeyStore format 

keystore no longer stores private key material in the clear. It needs to
use an opaque handle for the private key material and then keystore will
sign the data on the requester's behalf instead of returning the key
material.

Change-Id: I836749769a8519cfc21bfdc2a3b3c8c1a01d8f05
parent eff40f4d

src/com/android/settings/CredentialStorage.java

+29 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.res.Resources; 
import android.os.AsyncTask;

import android.os.Bundle;

import android.os.RemoteException;

import android.security.Credentials;

import android.security.KeyChain.KeyChainConnection;

import android.security.KeyChain;

import android.security.KeyStore;
@@ -187,13 +188,38 @@ public final class CredentialStorage extends Activity { 
        if (mInstallBundle != null && !mInstallBundle.isEmpty()) {

            Bundle bundle = mInstallBundle;

            mInstallBundle = null;

            for (String key : bundle.keySet()) {

                byte[] value = bundle.getByteArray(key);

                if (value != null && !mKeyStore.put(key, value)) {



            if (bundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {

                String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);

                byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);



                if (!mKeyStore.importKey(key, value)) {

                    Log.e(TAG, "Failed to install " + key);

                    return;

                }

            }



            if (bundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {

                String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);

                byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);



                if (!mKeyStore.put(certName, certData)) {

                    Log.e(TAG, "Failed to install " + certName);

                    return;

                }

            }



            if (bundle.containsKey(Credentials.EXTRA_CA_CERTIFICATES_NAME)) {

                String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);

                byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);



                if (!mKeyStore.put(caListName, caListData)) {

                    Log.e(TAG, "Failed to install " + caListName);

                    return;

                }



            }



            setResult(RESULT_OK);

        }

    }