diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-05-01 21:45:41 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-05-01 21:45:41 +0000 |
| commit | 480ccb4bfcc622c1ce320c20ce992188187f7573 (patch) | |
| tree | aebfd0e230d0370ec1ac1a9b1a99b478abdc6854 /gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java | |
| parent | 4d80ae24073737202d4c51bf9efd2466fea8696d (diff) | |
| download | classpath-480ccb4bfcc622c1ce320c20ce992188187f7573.tar.gz | |
2006-05-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge HEAD-->generics-branch for the period
2006-04-13 to 2006-05-01.
Diffstat (limited to 'gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java')
| -rw-r--r-- | gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java b/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java index 5b3badc8d..0d09d5cef 100644 --- a/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java +++ b/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.java @@ -44,6 +44,7 @@ import java.security.spec.AlgorithmParameterSpec; import java.util.HashMap; import javax.crypto.spec.DHGenParameterSpec; +import javax.crypto.spec.DHParameterSpec; import gnu.java.security.Registry; import gnu.java.security.jce.sig.KeyPairGeneratorAdapter; @@ -75,7 +76,8 @@ public class DHKeyPairGeneratorSpi HashMap attributes = new HashMap(); if (params != null) { - if (! (params instanceof DHGenParameterSpec)) + if (! (params instanceof DHGenParameterSpec) && + ! (params instanceof DHParameterSpec)) throw new InvalidAlgorithmParameterException("params"); attributes.put(GnuDHKeyPairGenerator.DH_PARAMETERS, params); |