summaryrefslogtreecommitdiffstats
path: root/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2014-08-07 15:44:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-08-06 23:55:49 +0000
commite46fd72598d3efe6d22c689da50ec30e433cbb19 (patch)
tree6c876ccbb5560aa6f9b7d42eeae00495568e5bc4 /bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
parent234720ebe66540a53cff98b2448dddbc884bd09f (diff)
parentd001700a15b8bd733ae344c1fc315b97c43c6590 (diff)
downloadandroid_external_bouncycastle-e46fd72598d3efe6d22c689da50ec30e433cbb19.tar.gz
android_external_bouncycastle-e46fd72598d3efe6d22c689da50ec30e433cbb19.tar.bz2
android_external_bouncycastle-e46fd72598d3efe6d22c689da50ec30e433cbb19.zip
Merge "Upgrade to 1.51"
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java')
-rw-r--r--bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
index af764f3..8ed42a1 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
@@ -24,7 +24,7 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.DERObjectIdentifier;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
import org.bouncycastle.jce.exception.ExtCertPathValidatorException;
import org.bouncycastle.x509.ExtendedPKIXParameters;
@@ -240,7 +240,7 @@ public class PKIXCertPathValidatorSpi
throw new ExtCertPathValidatorException(
"Algorithm identifier of public key of trust anchor could not be read.", e, certPath, -1);
}
- DERObjectIdentifier workingPublicKeyAlgorithm = workingAlgId.getObjectId();
+ ASN1ObjectIdentifier workingPublicKeyAlgorithm = workingAlgId.getAlgorithm();
ASN1Encodable workingPublicKeyParameters = workingAlgId.getParameters();
//
@@ -402,7 +402,7 @@ public class PKIXCertPathValidatorSpi
workingAlgId = CertPathValidatorUtilities.getAlgorithmIdentifier(workingPublicKey);
// (f)
- workingPublicKeyAlgorithm = workingAlgId.getObjectId();
+ workingPublicKeyAlgorithm = workingAlgId.getAlgorithm();
// (e)
workingPublicKeyParameters = workingAlgId.getParameters();
}