diff options
| author | Sergio Giro <sgiro@google.com> | 2015-04-24 14:59:41 +0100 |
|---|---|---|
| committer | ] <sgiro@google.com> | 2015-05-06 10:51:45 +0100 |
| commit | 367fb0bc4adc380cbe1f1a82c2a975dbf834be4c (patch) | |
| tree | 574a9329fb00f193817e065db9d222f383a90c53 /bcprov | |
| parent | 7f729f07947047c1ceaad8a78febacd1269a62b3 (diff) | |
| download | bouncycastle-367fb0bc4adc380cbe1f1a82c2a975dbf834be4c.tar.gz | |
bouncycastle: throw exception in failure expecting PKIX parameters
bug: 20545284
(cherry picked from commit fa0ac9cf9f44a17bb77070574674f2ef0ecc3498)
Change-Id: Ie640314c35a5a98fac32e15144eaf776e4f861cb
Diffstat (limited to 'bcprov')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java | 10 |
1 files changed, 9 insertions, 1 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 d9028125..3fdedad0 100644 --- a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java +++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java @@ -81,10 +81,18 @@ public class PKIXCertPathValidatorSpi { paramsPKIX = ((PKIXExtendedBuilderParameters)params).getBaseParameters(); } - else + // BEGIN android-changed + // else + else if (params instanceof PKIXExtendedParameters) + // END android-changed { paramsPKIX = (PKIXExtendedParameters)params; } + // BEGIN android-added + else { + throw new InvalidAlgorithmParameterException("Expecting PKIX algorithm parameters"); + } + // END android-added if (paramsPKIX.getTrustAnchors() == null) { |