Refactoring in openpgp.operator.bc

Author: peterdettman

pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyDataDecryptorFactory.java

@@ -1,7 +1,6 @@
 package org.bouncycastle.openpgp.operator.bc;
 
 import java.io.IOException;
-import java.math.BigInteger;
 
 import org.bouncycastle.asn1.cryptlib.CryptlibObjectIdentifiers;
 import org.bouncycastle.asn1.edec.EdECObjectIdentifiers;
@@ -18,6 +17,7 @@
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.RawAgreement;
 import org.bouncycastle.crypto.Wrapper;
+import org.bouncycastle.crypto.agreement.BasicRawAgreement;
 import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
 import org.bouncycastle.crypto.agreement.X25519Agreement;
 import org.bouncycastle.crypto.agreement.X448Agreement;
@@ -37,7 +37,6 @@
 import org.bouncycastle.openpgp.operator.PGPPad;
 import org.bouncycastle.openpgp.operator.RFC6637Utils;
 import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
 
 /**
  * A decryptor factory for handling public key decryption operations.
@@ -210,15 +209,11 @@ else if (ecPubKey.getCurveOID().equals(EdECObjectIdentifiers.id_X448))
         }
         else
         {
-            ECDomainParameters ecParameters = ((ECPrivateKeyParameters) privKey).getParameters();
-
+            ECDomainParameters ecParameters = ((ECPrivateKeyParameters)privKey).getParameters();
             ECPublicKeyParameters ephPub = new ECPublicKeyParameters(ecParameters.getCurve().decodePoint(pEnc),
-                    ecParameters);
+                ecParameters);
 
-            ECDHBasicAgreement agreement = new ECDHBasicAgreement();
-            agreement.init(privKey);
-            BigInteger S = agreement.calculateAgreement(ephPub);
-            secret = BigIntegers.asUnsignedByteArray(agreement.getFieldSize(), S);
+            secret = BcUtil.getSecret(new BasicRawAgreement(new ECDHBasicAgreement()), privKey, ephPub);
         }
         hashAlgorithm = ecPubKey.getHashAlgorithm();
         symmetricKeyAlgorithm = ecPubKey.getSymmetricKeyAlgorithm();

pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcPublicKeyKeyEncryptionMethodGenerator.java

@@ -17,6 +17,7 @@
 import org.bouncycastle.crypto.KeyGenerationParameters;
 import org.bouncycastle.crypto.RawAgreement;
 import org.bouncycastle.crypto.Wrapper;
+import org.bouncycastle.crypto.agreement.BasicRawAgreement;
 import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
 import org.bouncycastle.crypto.agreement.X25519Agreement;
 import org.bouncycastle.crypto.agreement.X448Agreement;
@@ -38,7 +39,6 @@
 import org.bouncycastle.openpgp.operator.PublicKeyKeyEncryptionMethodGenerator;
 import org.bouncycastle.openpgp.operator.RFC6637Utils;
 import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
 
 /**
  * A method generator for supporting public key based encryption operations.
@@ -122,10 +122,8 @@ else if (ecPubKey.getCurveOID().equals(EdECObjectIdentifiers.id_X448))
                     AsymmetricCipherKeyPair ephKp = getAsymmetricCipherKeyPair(new ECKeyPairGenerator(),
                         new ECKeyGenerationParameters(((ECPublicKeyParameters)cryptoPublicKey).getParameters(), random));
 
-                    ECDHBasicAgreement agreement = new ECDHBasicAgreement();
-                    agreement.init(ephKp.getPrivate());
-                    BigInteger S = agreement.calculateAgreement(cryptoPublicKey);
-                    byte[] secret = BigIntegers.asUnsignedByteArray(agreement.getFieldSize(), S);
+                    byte[] secret = BcUtil.getSecret(new BasicRawAgreement(new ECDHBasicAgreement()),
+                        ephKp.getPrivate(), cryptoPublicKey);
 
                     byte[] ephPubEncoding = ((ECPublicKeyParameters)ephKp.getPublic()).getQ().getEncoded(false);