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

Commit 1b291c13 authored by Kenny Root's avatar Kenny Root
Browse files

Stop using AlgNameMapper 

AlgNameMapper currently doesn't work after the transition to it being in
Conscrypt, so just get rid of it altogether.

Change-Id: I0e8b057915edcb584bd4470c43f3458efa49329e
parent 69704608

Android.mk

+1 −1
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common ims-common

LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common

LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305



LOCAL_MODULE_TAGS := optional

src/com/android/settings/CredentialStorage.java

+4 −3
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.org.bouncycastle.asn1.ASN1InputStream;

import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;



import org.apache.harmony.security.utils.AlgNameMapper;

import sun.security.util.ObjectIdentifier;

import sun.security.x509.AlgorithmId;



import java.io.ByteArrayInputStream;

import java.io.IOException;
@@ -217,8 +218,8 @@ public final class CredentialStorage extends Activity { 
        try {

            ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData));

            PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());

            String algId = pki.getAlgorithmId().getAlgorithm().getId();

            String algName = AlgNameMapper.map2AlgName(algId);

            String algOid = pki.getAlgorithmId().getAlgorithm().getId();

            String algName = new AlgorithmId(new ObjectIdentifier(algOid)).getName();



            return KeyChain.isBoundKeyAlgorithm(algName);

        } catch (IOException e) {