bcgit
diff --git a/‎core/src/main/java/org/bouncycastle/crypto/hpke/DHKEM.java‎
Lines changed: 0 additions & 2 deletions b/‎core/src/main/java/org/bouncycastle/crypto/hpke/DHKEM.java‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyDataDecryptorFactory.java‎
Lines changed: 2 additions & 3 deletions b/‎pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyDataDecryptorFactory.java‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎pgsc/src/main/java/org/bouncycastle/openpgp/smartcard/simulator/SimulatorOpenPGPSmartCard.java‎
Lines changed: 2 additions & 6 deletions b/‎pgsc/src/main/java/org/bouncycastle/openpgp/smartcard/simulator/SimulatorOpenPGPSmartCard.java‎
Lines changed: 2 additions & 6 deletions
@@ -7,8 +7,6 @@
 import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
 import org.bouncycastle.crypto.RawAgreement;
-import org.bouncycastle.crypto.agreement.BasicRawAgreement;
-import org.bouncycastle.crypto.agreement.ECDHCBasicAgreement;
 import org.bouncycastle.crypto.agreement.ECDHCRawAgreement;
 import org.bouncycastle.crypto.agreement.X25519Agreement;
 import org.bouncycastle.crypto.agreement.X448Agreement;
 
@@ -17,8 +17,7 @@
 import org.bouncycastle.crypto.BufferedAsymmetricBlockCipher;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.agreement.BasicRawAgreement;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
+import org.bouncycastle.crypto.agreement.ECDHRawAgreement;
 import org.bouncycastle.crypto.agreement.X25519Agreement;
 import org.bouncycastle.crypto.agreement.X448Agreement;
 import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
@@ -362,7 +361,7 @@ public byte[] decrypt(int keyAlgorithm, AsymmetricKeyParameter peerKey)
             switch (keyAlgorithm)
             {
                 case PublicKeyAlgorithmTags.ECDH:
-                    return BcUtil.getSecret(new BasicRawAgreement(new ECDHBasicAgreement()), privKey, peerKey);
+                    return BcUtil.getSecret(new ECDHRawAgreement(), privKey, peerKey);
 
                 case PublicKeyAlgorithmTags.X25519:
                     return BcUtil.getSecret(new X25519Agreement(), privKey, peerKey);
 
@@ -9,25 +9,21 @@
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.RawAgreement;
 import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.agreement.BasicRawAgreement;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
+import org.bouncycastle.crypto.agreement.ECDHRawAgreement;
 import org.bouncycastle.crypto.agreement.X25519Agreement;
 import org.bouncycastle.crypto.agreement.X448Agreement;
 import org.bouncycastle.crypto.encodings.PKCS1Encoding;
 import org.bouncycastle.crypto.engines.RSABlindedEngine;
 import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
 import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
 import org.bouncycastle.crypto.params.X25519PrivateKeyParameters;
-import org.bouncycastle.crypto.params.X25519PublicKeyParameters;
 import org.bouncycastle.crypto.params.X448PrivateKeyParameters;
-import org.bouncycastle.crypto.params.X448PublicKeyParameters;
 import org.bouncycastle.crypto.signers.DSASigner;
 import org.bouncycastle.crypto.signers.ECDSASigner;
 import org.bouncycastle.crypto.signers.Ed25519Signer;
 import org.bouncycastle.crypto.signers.Ed448Signer;
 import org.bouncycastle.crypto.signers.StandardDSAEncoding;
 import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.jcajce.provider.asymmetric.edec.BCXDHPublicKey;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPrivateKey;
 import org.bouncycastle.openpgp.PGPPublicKey;
@@ -329,7 +325,7 @@ else if (privateKey instanceof X448PrivateKeyParameters)
                     }
                     else
                     {
-                        agreement = new BasicRawAgreement(new ECDHBasicAgreement());
+                        agreement = new ECDHRawAgreement();
                     }
                     break;