diff options
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/math/ec/custom/sec/SecT571K1Point.java')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/math/ec/custom/sec/SecT571K1Point.java | 111 |
1 files changed, 70 insertions, 41 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/sec/SecT571K1Point.java b/bcprov/src/main/java/org/bouncycastle/math/ec/custom/sec/SecT571K1Point.java index c9238cd8..8f1c4cae 100644 --- a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/sec/SecT571K1Point.java +++ b/bcprov/src/main/java/org/bouncycastle/math/ec/custom/sec/SecT571K1Point.java @@ -5,6 +5,7 @@ import org.bouncycastle.math.ec.ECCurve; import org.bouncycastle.math.ec.ECFieldElement; import org.bouncycastle.math.ec.ECPoint; import org.bouncycastle.math.ec.ECPoint.AbstractF2m; +import org.bouncycastle.math.raw.Nat576; public class SecT571K1Point extends AbstractF2m { @@ -91,8 +92,8 @@ public class SecT571K1Point extends AbstractF2m ECCurve curve = this.getCurve(); - ECFieldElement X1 = this.x; - ECFieldElement X2 = b.getRawXCoord(); + SecT571FieldElement X1 = (SecT571FieldElement)this.x; + SecT571FieldElement X2 = (SecT571FieldElement)b.getRawXCoord(); if (X1.isZero()) { @@ -104,31 +105,49 @@ public class SecT571K1Point extends AbstractF2m return b.add(this); } - ECFieldElement L1 = this.y, Z1 = this.zs[0]; - ECFieldElement L2 = b.getRawYCoord(), Z2 = b.getZCoord(0); + SecT571FieldElement L1 = (SecT571FieldElement)this.y, Z1 = (SecT571FieldElement)this.zs[0]; + SecT571FieldElement L2 = (SecT571FieldElement)b.getRawYCoord(), Z2 = (SecT571FieldElement)b.getZCoord(0); - boolean Z1IsOne = Z1.isOne(); - ECFieldElement U2 = X2, S2 = L2; - if (!Z1IsOne) + long[] t1 = Nat576.create64(); + long[] t2 = Nat576.create64(); + long[] t3 = Nat576.create64(); + long[] t4 = Nat576.create64(); + + long[] Z1Precomp = Z1.isOne() ? null : SecT571Field.precompMultiplicand(Z1.x); + long[] U2, S2; + if (Z1Precomp == null) + { + U2 = X2.x; + S2 = L2.x; + } + else { - U2 = U2.multiply(Z1); - S2 = S2.multiply(Z1); + SecT571Field.multiplyPrecomp(X2.x, Z1Precomp, U2 = t2); + SecT571Field.multiplyPrecomp(L2.x, Z1Precomp, S2 = t4); } - boolean Z2IsOne = Z2.isOne(); - ECFieldElement U1 = X1, S1 = L1; - if (!Z2IsOne) + long[] Z2Precomp = Z2.isOne() ? null : SecT571Field.precompMultiplicand(Z2.x); + long[] U1, S1; + if (Z2Precomp == null) + { + U1 = X1.x; + S1 = L1.x; + } + else { - U1 = U1.multiply(Z2); - S1 = S1.multiply(Z2); + SecT571Field.multiplyPrecomp(X1.x, Z2Precomp, U1 = t1); + SecT571Field.multiplyPrecomp(L1.x, Z2Precomp, S1 = t3); } - ECFieldElement A = S1.add(S2); - ECFieldElement B = U1.add(U2); + long[] A = t3; + SecT571Field.add(S1, S2, A); - if (B.isZero()) + long[] B = t4; + SecT571Field.add(U1, U2, B); + + if (Nat576.isZero64(B)) { - if (A.isZero()) + if (Nat576.isZero64(A)) { return twice(); } @@ -136,55 +155,69 @@ public class SecT571K1Point extends AbstractF2m return curve.getInfinity(); } - ECFieldElement X3, L3, Z3; + SecT571FieldElement X3, L3, Z3; if (X2.isZero()) { // TODO This can probably be optimized quite a bit ECPoint p = this.normalize(); - X1 = p.getXCoord(); + X1 = (SecT571FieldElement)p.getXCoord(); ECFieldElement Y1 = p.getYCoord(); 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(); + X3 = (SecT571FieldElement)L.square().add(L).add(X1); if (X3.isZero()) { -// return new SecT571K1Point(curve, X3, curve.getB().sqrt(), this.withCompression); return new SecT571K1Point(curve, X3, curve.getB(), this.withCompression); } ECFieldElement Y3 = L.multiply(X1.add(X3)).add(X3).add(Y1); - L3 = Y3.divide(X3).add(X3); - Z3 = curve.fromBigInteger(ECConstants.ONE); + L3 = (SecT571FieldElement)Y3.divide(X3).add(X3); + Z3 = (SecT571FieldElement)curve.fromBigInteger(ECConstants.ONE); } else { - B = B.square(); + SecT571Field.square(B, B); + + long[] APrecomp = SecT571Field.precompMultiplicand(A); + + long[] AU1 = t1; + long[] AU2 = t2; - ECFieldElement AU1 = A.multiply(U1); - ECFieldElement AU2 = A.multiply(U2); + SecT571Field.multiplyPrecomp(U1, APrecomp, AU1); + SecT571Field.multiplyPrecomp(U2, APrecomp, AU2); + + X3 = new SecT571FieldElement(t1); + SecT571Field.multiply(AU1, AU2, X3.x); - X3 = AU1.multiply(AU2); if (X3.isZero()) { -// return new SecT571K1Point(curve, X3, curve.getB().sqrt(), this.withCompression); return new SecT571K1Point(curve, X3, curve.getB(), this.withCompression); } - ECFieldElement ABZ2 = A.multiply(B); - if (!Z2IsOne) + Z3 = new SecT571FieldElement(t3); + SecT571Field.multiplyPrecomp(B, APrecomp, Z3.x); + + if (Z2Precomp != null) { - ABZ2 = ABZ2.multiply(Z2); + SecT571Field.multiplyPrecomp(Z3.x, Z2Precomp, Z3.x); } - L3 = AU2.add(B).squarePlusProduct(ABZ2, L1.add(Z1)); + long[] tt = Nat576.createExt64(); + + SecT571Field.add(AU2, B, t4); + SecT571Field.squareAddToExt(t4, tt); + + SecT571Field.add(L1.x, Z1.x, t4); + SecT571Field.multiplyAddToExt(t4, Z3.x, tt); + + L3 = new SecT571FieldElement(t4); + SecT571Field.reduce(tt, L3.x); - Z3 = ABZ2; - if (!Z1IsOne) + if (Z1Precomp != null) { - Z3 = Z3.multiply(Z1); + SecT571Field.multiplyPrecomp(Z3.x, Z1Precomp, Z3.x); } } @@ -224,7 +257,6 @@ public class SecT571K1Point extends AbstractF2m if (T.isZero()) { -// return new SecT571K1Point(curve, T, curve.getB().sqrt(), withCompression); return new SecT571K1Point(curve, T, curve.getB(), withCompression); } @@ -273,10 +305,8 @@ public class SecT571K1Point extends AbstractF2m ECFieldElement Z1Sq = Z1.square(); ECFieldElement L1Z1 = L1.multiply(Z1); -// ECFieldElement T = curve.getA().multiply(Z1Sq).add(L1Sq).add(L1Z1); ECFieldElement T = L1Sq.add(L1Z1); ECFieldElement L2plus1 = L2.addOne(); -// ECFieldElement A = curve.getA().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(); @@ -293,7 +323,6 @@ public class SecT571K1Point extends AbstractF2m if (A.isZero()) { -// return new SecT571K1Point(curve, A, curve.getB().sqrt(), withCompression); return new SecT571K1Point(curve, A, curve.getB(), withCompression); } |