Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"

This commit is contained in:
Neil Fuller
2018-10-03 07:13:37 +00:00
committed by Gerrit Code Review

View File

@@ -218,7 +218,7 @@ 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 algOid = pki.getAlgorithmId().getAlgorithm().getId(); String algOid = pki.getPrivateKeyAlgorithm().getAlgorithm().getId();
String algName = new AlgorithmId(new ObjectIdentifier(algOid)).getName(); String algName = new AlgorithmId(new ObjectIdentifier(algOid)).getName();
return KeyChain.isBoundKeyAlgorithm(algName); return KeyChain.isBoundKeyAlgorithm(algName);