diff options
author | Alex Klyubin <klyubin@google.com> | 2013-03-19 12:26:57 -0700 |
---|---|---|
committer | Alex Klyubin <klyubin@google.com> | 2013-03-19 12:33:06 -0700 |
commit | b4d3d296c30f59214c961c928dc708889ceba3d4 (patch) | |
tree | 0bc91df784eacb96d6ec664a8e81741d157953a3 /bcprov | |
parent | 43be13a7c7968ba079c87fed7143ec4b6c642b2e (diff) | |
download | android_external_bouncycastle-b4d3d296c30f59214c961c928dc708889ceba3d4.tar.gz android_external_bouncycastle-b4d3d296c30f59214c961c928dc708889ceba3d4.tar.bz2 android_external_bouncycastle-b4d3d296c30f59214c961c928dc708889ceba3d4.zip |
Make ECDH KeyAgreement reject AlgorithmParameterSpec.
This makes the BouncyCastle JCA Provider pass
libcore.javax.crypto.ECDHKeyAgreementTest.
Change-Id: I462c93a19c5dfc00733deb76351631ab4b4601da
Diffstat (limited to 'bcprov')
-rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java index cc9b2db..cade228 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java @@ -221,6 +221,12 @@ public class KeyAgreementSpi SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException { + // BEGIN android-added + if (params != null) + { + throw new InvalidAlgorithmParameterException("No algorithm parameters supported"); + } + // END android-added initFromKey(key); } |