diff --git a/crypto/src/math/ec/custom/sec/SecT571K1Point.cs b/crypto/src/math/ec/custom/sec/SecT571K1Point.cs
index 0f132c84c..e5c3cc62f 100644
--- a/crypto/src/math/ec/custom/sec/SecT571K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecT571K1Point.cs
@@ -7,32 +7,19 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
internal class SecT571K1Point
: AbstractF2mPoint
{
- /**
- * @deprecated Use ECCurve.createPoint to construct points
- */
- public SecT571K1Point(ECCurve curve, ECFieldElement x, ECFieldElement y)
- : this(curve, x, y, false)
+ internal SecT571K1Point(ECCurve curve, ECFieldElement x, ECFieldElement y)
+ : base(curve, x, y)
{
}
- /**
- * @deprecated per-point compression property will be removed, refer {@link #getEncoded(bool)}
- */
- public SecT571K1Point(ECCurve curve, ECFieldElement x, ECFieldElement y, bool withCompression)
- : base(curve, x, y, withCompression)
- {
- if ((x == null) != (y == null))
- throw new ArgumentException("Exactly one of the field elements is null");
- }
-
- internal SecT571K1Point(ECCurve curve, ECFieldElement x, ECFieldElement y, ECFieldElement[] zs, bool withCompression)
- : base(curve, x, y, zs, withCompression)
+ internal SecT571K1Point(ECCurve curve, ECFieldElement x, ECFieldElement y, ECFieldElement[] zs)
+ : base(curve, x, y, zs)
{
}
protected override ECPoint Detach()
{
- return new SecT571K1Point(null, this.AffineXCoord, this.AffineYCoord); // earlier JDK
+ return new SecT571K1Point(null, this.AffineXCoord, this.AffineYCoord);
}
public override ECFieldElement YCoord
@@ -154,7 +141,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
X3 = (SecT571FieldElement)L.Square().Add(L).Add(X1);
if (X3.IsZero)
{
- return new SecT571K1Point(curve, X3, curve.B, IsCompressed);
+ return new SecT571K1Point(curve, X3, curve.B);
}
ECFieldElement Y3 = L.Multiply(X1.Add(X3)).Add(X3).Add(Y1);
@@ -178,7 +165,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
if (X3.IsZero)
{
- return new SecT571K1Point(curve, X3, curve.B, IsCompressed);
+ return new SecT571K1Point(curve, X3, curve.B);
}
Z3 = new SecT571FieldElement(t3);
@@ -207,7 +194,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
}
}
- return new SecT571K1Point(curve, X3, L3, new ECFieldElement[] { Z3 }, IsCompressed);
+ return new SecT571K1Point(curve, X3, L3, new ECFieldElement[] { Z3 });
}
public override ECPoint Twice()
@@ -240,7 +227,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
if (T.IsZero)
{
- return new SecT571K1Point(curve, T, curve.B, IsCompressed);
+ return new SecT571K1Point(curve, T, curve.B);
}
ECFieldElement X3 = T.Square();
@@ -250,7 +237,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
ECFieldElement t2 = Z1IsOne ? Z1 : Z1Sq.Square();
ECFieldElement L3 = t1.Add(T).Add(Z1Sq).Multiply(t1).Add(t2).Add(X3).Add(Z3);
- return new SecT571K1Point(curve, X3, L3, new ECFieldElement[] { Z3 }, IsCompressed);
+ return new SecT571K1Point(curve, X3, L3, new ECFieldElement[] { Z3 });
}
public override ECPoint TwicePlus(ECPoint b)
@@ -300,14 +287,14 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
if (A.IsZero)
{
- return new SecT571K1Point(curve, A, curve.B, IsCompressed);
+ return new SecT571K1Point(curve, A, curve.B);
}
ECFieldElement X3 = A.Square().Multiply(X2Z1Sq);
ECFieldElement Z3 = A.Multiply(B).Multiply(Z1Sq);
ECFieldElement L3 = A.Add(B).Square().MultiplyPlusProduct(T, L2plus1, Z3);
- return new SecT571K1Point(curve, X3, L3, new ECFieldElement[] { Z3 }, IsCompressed);
+ return new SecT571K1Point(curve, X3, L3, new ECFieldElement[] { Z3 });
}
public override ECPoint Negate()
@@ -321,7 +308,7 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
// L is actually Lambda (X + Y/X) here
ECFieldElement L = this.RawYCoord, Z = this.RawZCoords[0];
- return new SecT571K1Point(Curve, X, L.Add(Z), new ECFieldElement[] { Z }, IsCompressed);
+ return new SecT571K1Point(Curve, X, L.Add(Z), new ECFieldElement[] { Z });
}
}
}
|
