Clean up old comments in binary custom curve code

11 files changed, 6 insertions, 73 deletions

diff --git a/crypto/src/math/ec/custom/sec/SecT163K1Point.cs b/crypto/src/math/ec/custom/sec/SecT163K1Point.cs
index 2e3ba57d0..8693fe1c8 100644
--- a/crypto/src/math/ec/custom/sec/SecT163K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT163K1Point.cs
@@ -131,11 +131,9 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.getA());
                 X3 = L.Square().Add(L).Add(X1).AddOne();
                 if (X3.IsZero)
                 {
-                    //return new SecT163K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT163K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -153,7 +151,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 X3 = AU1.Multiply(AU2);
                 if (X3.IsZero)
                 {
-                    //return new SecT163K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT163K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -199,7 +196,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement T = L1.Square().Add(L1Z1).Add(Z1Sq);
             if (T.IsZero)
             {
-                //return new SecT163K1Point(curve, T, curve.B.sqrt(), withCompression);
                 return new SecT163K1Point(curve, T, curve.B, IsCompressed);
             }
 
@@ -243,10 +239,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.getA().Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = Z1Sq.Add(L1Sq).Add(L1Z1);
-            ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.getA().Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -261,13 +254,12 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (A.IsZero)
             {
-                //return new SecT163K1Point(curve, A, curve.B.sqrt(), withCompression);
                 return new SecT163K1Point(curve, A, curve.B, IsCompressed);
             }
 
             ECFieldElement X3 = A.Square().Multiply(X2Z1Sq);
             ECFieldElement Z3 = A.Multiply(B).Multiply(Z1Sq);
-            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2plus1, Z3);
+            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2.AddOne(), Z3);
 
             return new SecT163K1Point(curve, X3, L3, new ECFieldElement[] { Z3 }, IsCompressed);
         }
diff --git a/crypto/src/math/ec/custom/sec/SecT163R2Point.cs b/crypto/src/math/ec/custom/sec/SecT163R2Point.cs
index 07b3f1fd9..69e249739 100644
--- a/crypto/src/math/ec/custom/sec/SecT163R2Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT163R2Point.cs
@@ -133,7 +133,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1).AddOne();
                 if (X3.IsZero)
                 {
@@ -245,10 +244,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = Z1Sq.Add(L1Sq).Add(L1Z1);
-            ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -268,7 +264,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             ECFieldElement X3 = A.Square().Multiply(X2Z1Sq);
             ECFieldElement Z3 = A.Multiply(B).Multiply(Z1Sq);
-            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2plus1, Z3);
+            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2.AddOne(), Z3);
 
             return new SecT163R2Point(curve, X3, L3, new ECFieldElement[] { Z3 }, IsCompressed);
         }
diff --git a/crypto/src/math/ec/custom/sec/SecT233K1Point.cs b/crypto/src/math/ec/custom/sec/SecT233K1Point.cs
index 7e7ee8f0b..9a357ff8f 100644
--- a/crypto/src/math/ec/custom/sec/SecT233K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT233K1Point.cs
@@ -133,11 +133,9 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1);
                 if (X3.IsZero)
                 {
-                    //return new SecT233K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT233K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -155,7 +153,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 X3 = AU1.Multiply(AU2);
                 if (X3.IsZero)
                 {
-                    //return new SecT233K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT233K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -209,7 +206,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (T.IsZero)
             {
-                //return new SecT233K1Point(curve, T, curve.B.sqrt(), withCompression);
                 return new SecT233K1Point(curve, T, curve.B, IsCompressed);
             }
 
@@ -254,10 +250,8 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = L1Sq.Add(L1Z1);
             ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2plus1.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -274,7 +268,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (A.IsZero)
             {
-                //return new SecT233K1Point(curve, A, curve.B.sqrt(), withCompression);
                 return new SecT233K1Point(curve, A, curve.B, IsCompressed);
             }
 
diff --git a/crypto/src/math/ec/custom/sec/SecT233R1Point.cs b/crypto/src/math/ec/custom/sec/SecT233R1Point.cs
index ffac89d15..6347051d2 100644
--- a/crypto/src/math/ec/custom/sec/SecT233R1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT233R1Point.cs
@@ -131,7 +131,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1).AddOne();
                 if (X3.IsZero)
                 {
@@ -237,10 +236,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = Z1Sq.Add(L1Sq).Add(L1Z1);
-            ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -260,7 +256,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             ECFieldElement X3 = A.Square().Multiply(X2Z1Sq);
             ECFieldElement Z3 = A.Multiply(B).Multiply(Z1Sq);
-            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2plus1, Z3);
+            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2.AddOne(), Z3);
 
             return new SecT233R1Point(curve, X3, L3, new ECFieldElement[] { Z3 }, IsCompressed);
         }
diff --git a/crypto/src/math/ec/custom/sec/SecT239K1Point.cs b/crypto/src/math/ec/custom/sec/SecT239K1Point.cs
index ac079ad1e..fbd5117f8 100644
--- a/crypto/src/math/ec/custom/sec/SecT239K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT239K1Point.cs
@@ -131,11 +131,9 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //            X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1);
                 if (X3.IsZero)
                 {
-                    //return new SecT239K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT239K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -153,7 +151,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 X3 = AU1.Multiply(AU2);
                 if (X3.IsZero)
                 {
-                    //return new SecT239K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT239K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -206,7 +203,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (T.IsZero)
             {
-                //return new SecT239K1Point(curve, T, curve.B.sqrt(), withCompression);
                 return new SecT239K1Point(curve, T, curve.B, IsCompressed);
             }
 
@@ -251,10 +247,8 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = L1Sq.Add(L1Z1);
             ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2plus1.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -269,7 +263,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (A.IsZero)
             {
-                //return new SecT239K1Point(curve, A, curve.B.sqrt(), withCompression);
                 return new SecT239K1Point(curve, A, curve.B, IsCompressed);
             }
 
diff --git a/crypto/src/math/ec/custom/sec/SecT283K1Point.cs b/crypto/src/math/ec/custom/sec/SecT283K1Point.cs
index f85706c63..9856894a1 100644
--- a/crypto/src/math/ec/custom/sec/SecT283K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT283K1Point.cs
@@ -131,11 +131,9 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1);
                 if (X3.IsZero)
                 {
-                    //return new SecT283K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT283K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -153,7 +151,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 X3 = AU1.Multiply(AU2);
                 if (X3.IsZero)
                 {
-                    //return new SecT283K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT283K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -205,7 +202,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (T.IsZero)
             {
-                //return new SecT283K1Point(curve, T, curve.B.sqrt(), withCompression);
                 return new SecT283K1Point(curve, T, curve.B, IsCompressed);
             }
 
@@ -250,10 +246,8 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = L1Sq.Add(L1Z1);
             ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2plus1.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -268,7 +262,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (A.IsZero)
             {
-                //return new SecT283K1Point(curve, A, curve.B.sqrt(), withCompression);
                 return new SecT283K1Point(curve, A, curve.B, IsCompressed);
             }
 
diff --git a/crypto/src/math/ec/custom/sec/SecT283R1Point.cs b/crypto/src/math/ec/custom/sec/SecT283R1Point.cs
index 340bbdae6..4c1a7801d 100644
--- a/crypto/src/math/ec/custom/sec/SecT283R1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT283R1Point.cs
@@ -131,7 +131,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1).AddOne();
                 if (X3.IsZero)
                 {
@@ -237,10 +236,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = Z1Sq.Add(L1Sq).Add(L1Z1);
-            ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -260,7 +256,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             ECFieldElement X3 = A.Square().Multiply(X2Z1Sq);
             ECFieldElement Z3 = A.Multiply(B).Multiply(Z1Sq);
-            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2plus1, Z3);
+            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2.AddOne(), Z3);
 
             return new SecT283R1Point(curve, X3, L3, new ECFieldElement[] { Z3 }, IsCompressed);
         }
diff --git a/crypto/src/math/ec/custom/sec/SecT409K1Point.cs b/crypto/src/math/ec/custom/sec/SecT409K1Point.cs
index 71adc7af2..e67ca9a72 100644
--- a/crypto/src/math/ec/custom/sec/SecT409K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT409K1Point.cs
@@ -131,11 +131,9 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1);
                 if (X3.IsZero)
                 {
-                    //return new SecT409K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT409K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -153,7 +151,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 X3 = AU1.Multiply(AU2);
                 if (X3.IsZero)
                 {
-                    //return new SecT409K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT409K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -205,7 +202,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (T.IsZero)
             {
-                //return new SecT409K1Point(curve, T, curve.B.sqrt(), withCompression);
                 return new SecT409K1Point(curve, T, curve.B, IsCompressed);
             }
 
@@ -250,10 +246,8 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = L1Sq.Add(L1Z1);
             ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2plus1.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -268,7 +262,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (A.IsZero)
             {
-                //return new SecT409K1Point(curve, A, curve.B.sqrt(), withCompression);
                 return new SecT409K1Point(curve, A, curve.B, IsCompressed);
             }
 
diff --git a/crypto/src/math/ec/custom/sec/SecT409R1Point.cs b/crypto/src/math/ec/custom/sec/SecT409R1Point.cs
index af69fe656..92f6143dc 100644
--- a/crypto/src/math/ec/custom/sec/SecT409R1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT409R1Point.cs
@@ -131,7 +131,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1).AddOne();
                 if (X3.IsZero)
                 {
@@ -237,10 +236,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = Z1Sq.Add(L1Sq).Add(L1Z1);
-            ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -260,7 +256,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             ECFieldElement X3 = A.Square().Multiply(X2Z1Sq);
             ECFieldElement Z3 = A.Multiply(B).Multiply(Z1Sq);
-            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2plus1, Z3);
+            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2.AddOne(), Z3);
 
             return new SecT409R1Point(curve, X3, L3, new ECFieldElement[] { Z3 }, IsCompressed);
         }
diff --git a/crypto/src/math/ec/custom/sec/SecT571K1Point.cs b/crypto/src/math/ec/custom/sec/SecT571K1Point.cs
index 62ed7bda0..f92370f87 100644
--- a/crypto/src/math/ec/custom/sec/SecT571K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT571K1Point.cs
@@ -131,11 +131,9 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1).AddOne();
                 if (X3.IsZero)
                 {
-                    //return new SecT571K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT571K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -153,7 +151,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 X3 = AU1.Multiply(AU2);
                 if (X3.IsZero)
                 {
-                    //return new SecT571K1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT571K1Point(curve, X3, curve.B, IsCompressed);
                 }
 
@@ -205,7 +202,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (T.IsZero)
             {
-                //return new SecT571K1Point(curve, T, curve.B.sqrt(), withCompression);
                 return new SecT571K1Point(curve, T, curve.B, IsCompressed);
             }
 
@@ -250,10 +246,8 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = L1Sq.Add(L1Z1);
             ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2plus1.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -268,7 +262,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (A.IsZero)
             {
-                //return new SecT571K1Point(curve, A, curve.B.sqrt(), withCompression);
                 return new SecT571K1Point(curve, A, curve.B, IsCompressed);
             }
 
diff --git a/crypto/src/math/ec/custom/sec/SecT571R1Point.cs b/crypto/src/math/ec/custom/sec/SecT571R1Point.cs
index 0cbc98cf3..0d1fc98b6 100644
--- a/crypto/src/math/ec/custom/sec/SecT571R1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT571R1Point.cs
@@ -131,11 +131,9 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 ECFieldElement Y2 = L2;
                 ECFieldElement L = Y1.Add(Y2).Divide(X1);
 
-                //X3 = L.Square().Add(L).Add(X1).Add(curve.A);
                 X3 = L.Square().Add(L).Add(X1).AddOne();
                 if (X3.IsZero)
                 {
-                    //return new SecT571R1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT571R1Point(curve, X3, SecT571R1Curve.SecT571R1_B_SQRT, IsCompressed);
                 }
 
@@ -153,7 +151,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
                 X3 = AU1.Multiply(AU2);
                 if (X3.IsZero)
                 {
-                    //return new SecT571R1Point(curve, X3, curve.B.sqrt(), IsCompressed);
                     return new SecT571R1Point(curve, X3, SecT571R1Curve.SecT571R1_B_SQRT, IsCompressed);
                 }
 
@@ -197,7 +194,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement T = L1.Square().Add(L1Z1).Add(Z1Sq);
             if (T.IsZero)
             {
-                //return new SecT571R1Point(curve, T, curve.B.sqrt(), withCompression);
                 return new SecT571R1Point(curve, T, SecT571R1Curve.SecT571R1_B_SQRT, IsCompressed);
             }
 
@@ -240,10 +236,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
             ECFieldElement Z1Sq = Z1.Square();
             ECFieldElement L1Z1 = L1.Multiply(Z1);
 
-            //ECFieldElement T = curve.A.Multiply(Z1Sq).Add(L1Sq).Add(L1Z1);
             ECFieldElement T = Z1Sq.Add(L1Sq).Add(L1Z1);
-            ECFieldElement L2plus1 = L2.AddOne();
-            //ECFieldElement A = curve.A.Add(L2plus1).Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement A = L2.Multiply(Z1Sq).Add(L1Sq).MultiplyPlusProduct(T, X1Sq, Z1Sq);
             ECFieldElement X2Z1Sq = X2.Multiply(Z1Sq);
             ECFieldElement B = X2Z1Sq.Add(T).Square();
@@ -258,13 +251,12 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
 
             if (A.IsZero)
             {
-                //return new SecT571R1Point(curve, A, curve.B.sqrt(), withCompression);
                 return new SecT571R1Point(curve, A, SecT571R1Curve.SecT571R1_B_SQRT, IsCompressed);
             }
 
             ECFieldElement X3 = A.Square().Multiply(X2Z1Sq);
             ECFieldElement Z3 = A.Multiply(B).Multiply(Z1Sq);
-            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2plus1, Z3);
+            ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2.AddOne(), Z3);
 
             return new SecT571R1Point(curve, X3, L3, new ECFieldElement[] { Z3 }, IsCompressed);
         }