Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"

This commit is contained in:
Neil Fuller
2018-10-02 16:58:08 +00:00
committed by Android (Google) Code Review

View File

@@ -205,7 +205,7 @@ public final class CredentialStorage extends FragmentActivity {
try { try {
final ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData)); final ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData));
final PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject()); final PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
final String algOid = pki.getAlgorithmId().getAlgorithm().getId(); final String algOid = pki.getPrivateKeyAlgorithm().getAlgorithm().getId();
final String algName = new AlgorithmId(new ObjectIdentifier(algOid)).getName(); final String algName = new AlgorithmId(new ObjectIdentifier(algOid)).getName();
return KeyChain.isBoundKeyAlgorithm(algName); return KeyChain.isBoundKeyAlgorithm(algName);