Cleanup tls.crypto domain classes

Author: peterdettman

tls/src/main/java/org/bouncycastle/tls/crypto/impl/bc/BcTlsDHDomain.java

@@ -57,20 +57,20 @@ public static DHParameters getDomainParameters(TlsDHConfig dhConfig)
         return new DHParameters(dhGroup.getP(), dhGroup.getG(), dhGroup.getQ(), dhGroup.getL());
     }
 
-    protected BcTlsCrypto crypto;
-    protected TlsDHConfig config;
-    protected DHParameters domainParameters;
+    protected final BcTlsCrypto crypto;
+    protected final DHParameters domainParameters;
+    protected final boolean isPadded;
 
     public BcTlsDHDomain(BcTlsCrypto crypto, TlsDHConfig dhConfig)
     {
         this.crypto = crypto;
-        this.config = dhConfig;
         this.domainParameters = getDomainParameters(dhConfig);
+        this.isPadded = dhConfig.isPadded();
     }
 
     public BcTlsSecret calculateDHAgreement(DHPrivateKeyParameters privateKey, DHPublicKeyParameters publicKey)
     {
-        return calculateDHAgreement(crypto, privateKey, publicKey, config.isPadded());
+        return calculateDHAgreement(crypto, privateKey, publicKey, isPadded);
     }
 
     public TlsAgreement createDH()
@@ -80,7 +80,7 @@ public TlsAgreement createDH()
 
     public BigInteger decodeParameter(byte[] encoding) throws IOException
     {
-        if (config.isPadded() && getValueLength(domainParameters) != encoding.length)
+        if (isPadded && getValueLength(domainParameters) != encoding.length)
         {
             throw new TlsFatalAlert(AlertDescription.illegal_parameter);
         }
@@ -109,7 +109,7 @@ public DHPublicKeyParameters decodePublicKey(byte[] encoding) throws IOException
 
     public byte[] encodeParameter(BigInteger x)
     {
-        return encodeValue(domainParameters, config.isPadded(), x);
+        return encodeValue(domainParameters, isPadded, x);
     }
 
     public byte[] encodePublicKey(DHPublicKeyParameters publicKey)

tls/src/main/java/org/bouncycastle/tls/crypto/impl/bc/BcTlsECDomain.java

@@ -79,13 +79,11 @@ public static ECDomainParameters getDomainParameters(int namedGroup)
     }
 
     protected final BcTlsCrypto crypto;
-    protected final TlsECConfig config;
     protected final ECDomainParameters domainParameters;
 
     public BcTlsECDomain(BcTlsCrypto crypto, TlsECConfig ecConfig)
     {
         this.crypto = crypto;
-        this.config = ecConfig;
         this.domainParameters = getDomainParameters(ecConfig);
     }
 

tls/src/main/java/org/bouncycastle/tls/crypto/impl/bc/BcTlsMLKemDomain.java

@@ -35,14 +35,12 @@ public static MLKEMParameters getDomainParameters(TlsKemConfig kemConfig)
     }
 
     protected final BcTlsCrypto crypto;
-    protected final TlsKemConfig config;
     protected final MLKEMParameters domainParameters;
     protected final boolean isServer;
 
     public BcTlsMLKemDomain(BcTlsCrypto crypto, TlsKemConfig kemConfig)
     {
         this.crypto = crypto;
-        this.config = kemConfig;
         this.domainParameters = getDomainParameters(kemConfig);
         this.isServer = kemConfig.isServer();
     }

tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JceTlsDHDomain.java

@@ -71,8 +71,8 @@ public static JceTlsSecret calculateDHAgreement(JcaTlsCrypto crypto, DHPrivateKe
     }
 
     protected final JcaTlsCrypto crypto;
-    protected final TlsDHConfig dhConfig;
     protected final DHParameterSpec dhSpec;
+    protected final boolean isPadded;
 
     public JceTlsDHDomain(JcaTlsCrypto crypto, TlsDHConfig dhConfig)
     {
@@ -83,8 +83,8 @@ public JceTlsDHDomain(JcaTlsCrypto crypto, TlsDHConfig dhConfig)
             if (null != spec)
             {
                 this.crypto = crypto;
-                this.dhConfig = dhConfig;
                 this.dhSpec = spec;
+                this.isPadded = dhConfig.isPadded();
                 return;
             }
         }
@@ -95,7 +95,7 @@ public JceTlsDHDomain(JcaTlsCrypto crypto, TlsDHConfig dhConfig)
     public JceTlsSecret calculateDHAgreement(DHPrivateKey privateKey, DHPublicKey publicKey)
         throws IOException
     {
-        return calculateDHAgreement(crypto, privateKey, publicKey, dhConfig.isPadded());
+        return calculateDHAgreement(crypto, privateKey, publicKey, isPadded);
     }
 
     public TlsAgreement createDH()
@@ -105,7 +105,7 @@ public TlsAgreement createDH()
 
     public BigInteger decodeParameter(byte[] encoding) throws IOException
     {
-        if (dhConfig.isPadded() && getValueLength(dhSpec) != encoding.length)
+        if (isPadded && getValueLength(dhSpec) != encoding.length)
         {
             throw new TlsFatalAlert(AlertDescription.illegal_parameter);
         }
@@ -140,7 +140,7 @@ public DHPublicKey decodePublicKey(byte[] encoding) throws IOException
 
     public byte[] encodeParameter(BigInteger x) throws IOException
     {
-        return encodeValue(dhSpec, dhConfig.isPadded(), x);
+        return encodeValue(dhSpec, isPadded, x);
     }
 
     public byte[] encodePublicKey(DHPublicKey publicKey) throws IOException

tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/JceTlsECDomain.java

@@ -29,7 +29,6 @@ public class JceTlsECDomain
     implements TlsECDomain
 {
     protected final JcaTlsCrypto crypto;
-    protected final TlsECConfig ecConfig;
     protected final ECParameterSpec ecSpec;
     protected final ECCurve ecCurve;
 
@@ -42,7 +41,6 @@ public JceTlsECDomain(JcaTlsCrypto crypto, TlsECConfig ecConfig)
             if (null != spec)
             {
                 this.crypto = crypto;
-                this.ecConfig = ecConfig;
                 this.ecSpec =  spec;
                 this.ecCurve = ECUtil.convertCurve(spec.getCurve(), spec.getOrder(), spec.getCofactor());
                 return;