Refactor HQCKeyPairGenerator

Author: peterdettman

core/src/main/java/org/bouncycastle/pqc/crypto/hqc/HQCKeyPairGenerator.java

@@ -9,36 +9,26 @@
 public class HQCKeyPairGenerator
     implements AsymmetricCipherKeyPairGenerator
 {
-
-    private HQCKeyGenerationParameters hqcKeyGenerationParameters;
-
     private SecureRandom random;
+    private HQCParameters parameters;
 
     @Override
     public void init(KeyGenerationParameters params)
     {
-        this.hqcKeyGenerationParameters = (HQCKeyGenerationParameters)params;
         this.random = params.getRandom();
+        this.parameters = ((HQCKeyGenerationParameters)params).getParameters();
     }
 
-    private AsymmetricCipherKeyPair genKeyPair()
+    @Override
+    public AsymmetricCipherKeyPair generateKeyPair()
     {
-        HQCEngine engine = hqcKeyGenerationParameters.getParameters().getEngine();
-        byte[] pk = new byte[hqcKeyGenerationParameters.getParameters().getPublicKeyBytes()];
-        byte[] sk = new byte[hqcKeyGenerationParameters.getParameters().getSecretKeyBytes()];
-
-        engine.genKeyPair(pk, sk, random);
+        byte[] pk = new byte[parameters.getPublicKeyBytes()];
+        byte[] sk = new byte[parameters.getSecretKeyBytes()];
 
-        // form keys
-        HQCPublicKeyParameters publicKey = new HQCPublicKeyParameters(hqcKeyGenerationParameters.getParameters(), pk);
-        HQCPrivateKeyParameters privateKey = new HQCPrivateKeyParameters(hqcKeyGenerationParameters.getParameters(), sk);
+        parameters.getEngine().genKeyPair(pk, sk, random);
 
+        HQCPublicKeyParameters publicKey = new HQCPublicKeyParameters(parameters, pk);
+        HQCPrivateKeyParameters privateKey = new HQCPrivateKeyParameters(parameters, sk);
         return new AsymmetricCipherKeyPair(publicKey, privateKey);
     }
-
-    @Override
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        return genKeyPair();
-    }
 }