Skip to content

Commit 2827a0b

Browse files
committed
removed use of ElGamalPublicKey (reduce portability issues)
1 parent 310b30a commit 2827a0b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
7777
import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
7878
import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
79-
import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
8079
import org.bouncycastle.math.ec.ECCurve;
8180
import org.bouncycastle.math.ec.ECPoint;
8281
import org.bouncycastle.math.ec.rfc7748.X25519;
@@ -560,8 +559,8 @@ private BCPGKey getPublicBCPGKey(int algorithm, PGPAlgorithmParameters algorithm
560559
case PublicKeyAlgorithmTags.ELGAMAL_ENCRYPT:
561560
case PublicKeyAlgorithmTags.ELGAMAL_GENERAL:
562561
{
563-
ElGamalPublicKey egK = (ElGamalPublicKey) pubKey;
564-
return new ElGamalPublicBCPGKey(egK.getParameters().getP(), egK.getParameters().getG(), egK.getY());
562+
DHPublicKey egK = (DHPublicKey) pubKey;
563+
return new ElGamalPublicBCPGKey(egK.getParams().getP(), egK.getParams().getG(), egK.getY());
565564
}
566565
case PublicKeyAlgorithmTags.DSA:
567566
{

prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPublicKey.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
import javax.crypto.interfaces.DHPublicKey;
66

7+
/**
8+
* @deprecated just use DHPublicKey.
9+
*/
710
public interface ElGamalPublicKey
811
extends ElGamalKey, DHPublicKey
912
{

0 commit comments

Comments
 (0)