minor refactoring - removal of common code.

Author: dghgit

core/src/main/java/org/bouncycastle/pqc/math/ntru/HPSPolynomial.java

@@ -112,36 +112,4 @@ public void lift(Polynomial a)
         System.arraycopy(a.coeffs, 0, this.coeffs, 0, n);
         this.z3ToZq();
     }
-
-    @Override
-    public void r2Inv(Polynomial a)
-    {
-        HPSPolynomial f = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        HPSPolynomial g = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        HPSPolynomial v = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        HPSPolynomial w = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        this.r2Inv(a, f, g, v, w);
-    }
-
-    @Override
-    public void rqInv(Polynomial a)
-    {
-        HPSPolynomial ai2 = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        HPSPolynomial b = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        HPSPolynomial c = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        HPSPolynomial s = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        this.rqInv(a, ai2, b, c, s);
-    }
-
-    @Override
-    public void s3Inv(Polynomial a)
-    {
-        HPSPolynomial f = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        HPSPolynomial g = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        HPSPolynomial v = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        HPSPolynomial w = new HPSPolynomial((NTRUHPSParameterSet)this.params);
-        this.s3Inv(a, f, g, v, w);
-    }
-
-
 }

core/src/main/java/org/bouncycastle/pqc/math/ntru/HRSSPolynomial.java

@@ -162,34 +162,4 @@ public void lift(Polynomial a)
             this.coeffs[i + 1] = (short)(b.coeffs[i] - b.coeffs[i + 1]);
         }
     }
-
-    @Override
-    public void r2Inv(Polynomial a)
-    {
-        Polynomial f = this.params.createPolynomial();
-        Polynomial g = this.params.createPolynomial();
-        Polynomial v = this.params.createPolynomial();
-        Polynomial w = this.params.createPolynomial();
-        this.r2Inv(a, f, g, v, w);
-    }
-
-    @Override
-    public void rqInv(Polynomial a)
-    {
-        Polynomial ai2 = this.params.createPolynomial();
-        Polynomial b = this.params.createPolynomial();
-        Polynomial c = this.params.createPolynomial();
-        Polynomial s = this.params.createPolynomial();
-        this.rqInv(a, ai2, b, c, s);
-    }
-
-    @Override
-    public void s3Inv(Polynomial a)
-    {
-        Polynomial f = this.params.createPolynomial();
-        Polynomial g = this.params.createPolynomial();
-        Polynomial v = this.params.createPolynomial();
-        Polynomial w = this.params.createPolynomial();
-        this.s3Inv(a, f, g, v, w);
-    }
 }

core/src/main/java/org/bouncycastle/pqc/math/ntru/Polynomial.java

@@ -257,9 +257,35 @@ public void rqToS3(Polynomial a)
         this.mod3PhiN();
     }
 
-
     // defined in poly_r2_inv.c
-    public abstract void r2Inv(Polynomial a);
+    public void r2Inv(Polynomial a)
+    {
+        Polynomial f = this.params.createPolynomial();
+        Polynomial g = this.params.createPolynomial();
+        Polynomial v = this.params.createPolynomial();
+        Polynomial w = this.params.createPolynomial();
+        this.r2Inv(a, f, g, v, w);
+    }
+
+    // defined in poly.c
+    public void rqInv(Polynomial a)
+    {
+        Polynomial ai2 = this.params.createPolynomial();
+        Polynomial b = this.params.createPolynomial();
+        Polynomial c = this.params.createPolynomial();
+        Polynomial s = this.params.createPolynomial();
+        this.rqInv(a, ai2, b, c, s);
+    }
+
+    // defined in poly_s3_inv.c
+    public void s3Inv(Polynomial a)
+    {
+        Polynomial f = this.params.createPolynomial();
+        Polynomial g = this.params.createPolynomial();
+        Polynomial v = this.params.createPolynomial();
+        Polynomial w = this.params.createPolynomial();
+        this.s3Inv(a, f, g, v, w);
+    }
 
     void r2Inv(Polynomial a, Polynomial f, Polynomial g, Polynomial v, Polynomial w)
     {
@@ -326,9 +352,6 @@ void r2Inv(Polynomial a, Polynomial f, Polynomial g, Polynomial v, Polynomial w)
         this.coeffs[n - 1] = 0;
     }
 
-    // defined in poly.c
-    public abstract void rqInv(Polynomial a);
-
     void rqInv(Polynomial a, Polynomial ai2, Polynomial b, Polynomial c, Polynomial s)
     {
         ai2.r2Inv(a);
@@ -365,10 +388,7 @@ private void r2InvToRqInv(Polynomial ai, Polynomial a, Polynomial b, Polynomial
         c.coeffs[0] += 2;
         this.rqMul(c, s);
     }
-
-    // defined in poly_s3_inv.c
-    public abstract void s3Inv(Polynomial a);
-
+    
     void s3Inv(Polynomial a, Polynomial f, Polynomial g, Polynomial v, Polynomial w)
     {
         int n = this.coeffs.length;