PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using AlgNameMapper

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

Change-Id: I0e8b057915edcb584bd4470c43f3458efa49329e
This commit is contained in:
Kenny Root
2016-01-20 15:50:55 -08:00
parent 69704608f4
commit 1b291c13f4
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) 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_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional

7
src/com/android/settings/CredentialStorage.java
View File

@@ -48,7 +48,8 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.org.bouncycastle.asn1.ASN1InputStream; import com.android.org.bouncycastle.asn1.ASN1InputStream;
import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo; 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.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
@@ -217,8 +218,8 @@ public final class CredentialStorage extends Activity {
try { try {
ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData)); ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData));
PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject()); PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
String algId = pki.getAlgorithmId().getAlgorithm().getId(); String algOid = pki.getAlgorithmId().getAlgorithm().getId();
String algName = AlgNameMapper.map2AlgName(algId); String algName = new AlgorithmId(new ObjectIdentifier(algOid)).getName();
return KeyChain.isBoundKeyAlgorithm(algName); return KeyChain.isBoundKeyAlgorithm(algName);
} catch (IOException e) { } catch (IOException e) {