diff --git a/crypto/src/math/ec/custom/sec/SecT113Field.cs b/crypto/src/math/ec/custom/sec/SecT113Field.cs
index 1c4576062..3c9e0938d 100644
--- a/crypto/src/math/ec/custom/sec/SecT113Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecT113Field.cs
@@ -30,11 +30,32 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
z[1] = x[1];
}
+ private static void AddTo(ulong[] x, ulong[] z)
+ {
+ z[0] ^= x[0];
+ z[1] ^= x[1];
+ }
+
public static ulong[] FromBigInteger(BigInteger x)
{
return Nat.FromBigInteger64(113, x);
}
+ public static void HalfTrace(ulong[] x, ulong[] z)
+ {
+ ulong[] tt = Nat128.CreateExt64();
+
+ Nat128.Copy64(x, z);
+ for (int i = 1; i < 113; i += 2)
+ {
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ AddTo(x, z);
+ }
+ }
+
public static void Invert(ulong[] x, ulong[] z)
{
if (Nat128.IsZero64(x))
diff --git a/crypto/src/math/ec/custom/sec/SecT113FieldElement.cs b/crypto/src/math/ec/custom/sec/SecT113FieldElement.cs
index bb87b00fc..63de2b88c 100644
--- a/crypto/src/math/ec/custom/sec/SecT113FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecT113FieldElement.cs
@@ -150,6 +150,18 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
return new SecT113FieldElement(z);
}
+ public override ECFieldElement HalfTrace()
+ {
+ ulong[] z = Nat128.Create64();
+ SecT113Field.HalfTrace(x, z);
+ return new SecT113FieldElement(z);
+ }
+
+ public override bool HasFastTrace
+ {
+ get { return true; }
+ }
+
public override int Trace()
{
return (int)SecT113Field.Trace(x);
diff --git a/crypto/src/math/ec/custom/sec/SecT131Field.cs b/crypto/src/math/ec/custom/sec/SecT131Field.cs
index 248b1969e..db703d9e0 100644
--- a/crypto/src/math/ec/custom/sec/SecT131Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecT131Field.cs
@@ -35,11 +35,33 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
z[2] = x[2];
}
+ private static void AddTo(ulong[] x, ulong[] z)
+ {
+ z[0] ^= x[0];
+ z[1] ^= x[1];
+ z[2] ^= x[2];
+ }
+
public static ulong[] FromBigInteger(BigInteger x)
{
return Nat.FromBigInteger64(131, x);
}
+ public static void HalfTrace(ulong[] x, ulong[] z)
+ {
+ ulong[] tt = Nat.Create64(5);
+
+ Nat192.Copy64(x, z);
+ for (int i = 1; i < 131; i += 2)
+ {
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ AddTo(x, z);
+ }
+ }
+
public static void Invert(ulong[] x, ulong[] z)
{
if (Nat192.IsZero64(x))
diff --git a/crypto/src/math/ec/custom/sec/SecT131FieldElement.cs b/crypto/src/math/ec/custom/sec/SecT131FieldElement.cs
index f96c7ca39..4884e7152 100644
--- a/crypto/src/math/ec/custom/sec/SecT131FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecT131FieldElement.cs
@@ -150,6 +150,18 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
return new SecT131FieldElement(z);
}
+ public override ECFieldElement HalfTrace()
+ {
+ ulong[] z = Nat192.Create64();
+ SecT131Field.HalfTrace(x, z);
+ return new SecT131FieldElement(z);
+ }
+
+ public override bool HasFastTrace
+ {
+ get { return true; }
+ }
+
public override int Trace()
{
return (int)SecT131Field.Trace(x);
diff --git a/crypto/src/math/ec/custom/sec/SecT163Field.cs b/crypto/src/math/ec/custom/sec/SecT163Field.cs
index bc35ae6e8..b7f60d860 100644
--- a/crypto/src/math/ec/custom/sec/SecT163Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecT163Field.cs
@@ -36,11 +36,33 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
z[2] = x[2];
}
+ private static void AddTo(ulong[] x, ulong[] z)
+ {
+ z[0] ^= x[0];
+ z[1] ^= x[1];
+ z[2] ^= x[2];
+ }
+
public static ulong[] FromBigInteger(BigInteger x)
{
return Nat.FromBigInteger64(163, x);
}
+ public static void HalfTrace(ulong[] x, ulong[] z)
+ {
+ ulong[] tt = Nat192.CreateExt64();
+
+ Nat192.Copy64(x, z);
+ for (int i = 1; i < 163; i += 2)
+ {
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ AddTo(x, z);
+ }
+ }
+
public static void Invert(ulong[] x, ulong[] z)
{
if (Nat192.IsZero64(x))
diff --git a/crypto/src/math/ec/custom/sec/SecT163FieldElement.cs b/crypto/src/math/ec/custom/sec/SecT163FieldElement.cs
index 903645999..214a56343 100644
--- a/crypto/src/math/ec/custom/sec/SecT163FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecT163FieldElement.cs
@@ -150,6 +150,18 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
return new SecT163FieldElement(z);
}
+ public override ECFieldElement HalfTrace()
+ {
+ ulong[] z = Nat192.Create64();
+ SecT163Field.HalfTrace(x, z);
+ return new SecT163FieldElement(z);
+ }
+
+ public override bool HasFastTrace
+ {
+ get { return true; }
+ }
+
public override int Trace()
{
return (int)SecT163Field.Trace(x);
diff --git a/crypto/src/math/ec/custom/sec/SecT193Field.cs b/crypto/src/math/ec/custom/sec/SecT193Field.cs
index a186da7b6..3ad9b0af2 100644
--- a/crypto/src/math/ec/custom/sec/SecT193Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecT193Field.cs
@@ -37,11 +37,34 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
z[3] = x[3];
}
+ private static void AddTo(ulong[] x, ulong[] z)
+ {
+ z[0] ^= x[0];
+ z[1] ^= x[1];
+ z[2] ^= x[2];
+ z[3] ^= x[3];
+ }
+
public static ulong[] FromBigInteger(BigInteger x)
{
return Nat.FromBigInteger64(193, x);
}
+ public static void HalfTrace(ulong[] x, ulong[] z)
+ {
+ ulong[] tt = Nat256.CreateExt64();
+
+ Nat256.Copy64(x, z);
+ for (int i = 1; i < 193; i += 2)
+ {
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ AddTo(x, z);
+ }
+ }
+
public static void Invert(ulong[] x, ulong[] z)
{
if (Nat256.IsZero64(x))
diff --git a/crypto/src/math/ec/custom/sec/SecT193FieldElement.cs b/crypto/src/math/ec/custom/sec/SecT193FieldElement.cs
index 9813bcb01..3a3ed09ce 100644
--- a/crypto/src/math/ec/custom/sec/SecT193FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecT193FieldElement.cs
@@ -150,6 +150,18 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
return new SecT193FieldElement(z);
}
+ public override ECFieldElement HalfTrace()
+ {
+ ulong[] z = Nat256.Create64();
+ SecT193Field.HalfTrace(x, z);
+ return new SecT193FieldElement(z);
+ }
+
+ public override bool HasFastTrace
+ {
+ get { return true; }
+ }
+
public override int Trace()
{
return (int)SecT193Field.Trace(x);
diff --git a/crypto/src/math/ec/custom/sec/SecT233Field.cs b/crypto/src/math/ec/custom/sec/SecT233Field.cs
index 013e6b8f9..d7916c57d 100644
--- a/crypto/src/math/ec/custom/sec/SecT233Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecT233Field.cs
@@ -38,11 +38,34 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
z[3] = x[3];
}
+ private static void AddTo(ulong[] x, ulong[] z)
+ {
+ z[0] ^= x[0];
+ z[1] ^= x[1];
+ z[2] ^= x[2];
+ z[3] ^= x[3];
+ }
+
public static ulong[] FromBigInteger(BigInteger x)
{
return Nat.FromBigInteger64(233, x);
}
+ public static void HalfTrace(ulong[] x, ulong[] z)
+ {
+ ulong[] tt = Nat256.CreateExt64();
+
+ Nat256.Copy64(x, z);
+ for (int i = 1; i < 233; i += 2)
+ {
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ AddTo(x, z);
+ }
+ }
+
public static void Invert(ulong[] x, ulong[] z)
{
if (Nat256.IsZero64(x))
diff --git a/crypto/src/math/ec/custom/sec/SecT233FieldElement.cs b/crypto/src/math/ec/custom/sec/SecT233FieldElement.cs
index fbfe35e13..8aff8c87a 100644
--- a/crypto/src/math/ec/custom/sec/SecT233FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecT233FieldElement.cs
@@ -150,6 +150,18 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
return new SecT233FieldElement(z);
}
+ public override ECFieldElement HalfTrace()
+ {
+ ulong[] z = Nat256.Create64();
+ SecT233Field.HalfTrace(x, z);
+ return new SecT233FieldElement(z);
+ }
+
+ public override bool HasFastTrace
+ {
+ get { return true; }
+ }
+
public override int Trace()
{
return (int)SecT233Field.Trace(x);
diff --git a/crypto/src/math/ec/custom/sec/SecT239Field.cs b/crypto/src/math/ec/custom/sec/SecT239Field.cs
index b0c033fe2..eab929359 100644
--- a/crypto/src/math/ec/custom/sec/SecT239Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecT239Field.cs
@@ -38,11 +38,34 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
z[3] = x[3];
}
+ private static void AddTo(ulong[] x, ulong[] z)
+ {
+ z[0] ^= x[0];
+ z[1] ^= x[1];
+ z[2] ^= x[2];
+ z[3] ^= x[3];
+ }
+
public static ulong[] FromBigInteger(BigInteger x)
{
return Nat.FromBigInteger64(239, x);
}
+ public static void HalfTrace(ulong[] x, ulong[] z)
+ {
+ ulong[] tt = Nat256.CreateExt64();
+
+ Nat256.Copy64(x, z);
+ for (int i = 1; i < 239; i += 2)
+ {
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ AddTo(x, z);
+ }
+ }
+
public static void Invert(ulong[] x, ulong[] z)
{
if (Nat256.IsZero64(x))
diff --git a/crypto/src/math/ec/custom/sec/SecT239FieldElement.cs b/crypto/src/math/ec/custom/sec/SecT239FieldElement.cs
index b1b58e89b..9f1bf671c 100644
--- a/crypto/src/math/ec/custom/sec/SecT239FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecT239FieldElement.cs
@@ -150,6 +150,18 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
return new SecT239FieldElement(z);
}
+ public override ECFieldElement HalfTrace()
+ {
+ ulong[] z = Nat256.Create64();
+ SecT239Field.HalfTrace(x, z);
+ return new SecT239FieldElement(z);
+ }
+
+ public override bool HasFastTrace
+ {
+ get { return true; }
+ }
+
public override int Trace()
{
return (int)SecT239Field.Trace(x);
diff --git a/crypto/src/math/ec/custom/sec/SecT283Field.cs b/crypto/src/math/ec/custom/sec/SecT283Field.cs
index ec2ba2cc1..4e2cee0f8 100644
--- a/crypto/src/math/ec/custom/sec/SecT283Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecT283Field.cs
@@ -43,11 +43,35 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
z[4] = x[4];
}
+ private static void AddTo(ulong[] x, ulong[] z)
+ {
+ z[0] ^= x[0];
+ z[1] ^= x[1];
+ z[2] ^= x[2];
+ z[3] ^= x[3];
+ z[4] ^= x[4];
+ }
+
public static ulong[] FromBigInteger(BigInteger x)
{
return Nat.FromBigInteger64(283, x);
}
+ public static void HalfTrace(ulong[] x, ulong[] z)
+ {
+ ulong[] tt = Nat.Create64(9);
+
+ Nat320.Copy64(x, z);
+ for (int i = 1; i < 283; i += 2)
+ {
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ AddTo(x, z);
+ }
+ }
+
public static void Invert(ulong[] x, ulong[] z)
{
if (Nat320.IsZero64(x))
diff --git a/crypto/src/math/ec/custom/sec/SecT283FieldElement.cs b/crypto/src/math/ec/custom/sec/SecT283FieldElement.cs
index c1bb2e30c..6bd720acd 100644
--- a/crypto/src/math/ec/custom/sec/SecT283FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecT283FieldElement.cs
@@ -150,6 +150,18 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
return new SecT283FieldElement(z);
}
+ public override ECFieldElement HalfTrace()
+ {
+ ulong[] z = Nat320.Create64();
+ SecT283Field.HalfTrace(x, z);
+ return new SecT283FieldElement(z);
+ }
+
+ public override bool HasFastTrace
+ {
+ get { return true; }
+ }
+
public override int Trace()
{
return (int)SecT283Field.Trace(x);
diff --git a/crypto/src/math/ec/custom/sec/SecT409Field.cs b/crypto/src/math/ec/custom/sec/SecT409Field.cs
index 7cb9d4529..2e5609542 100644
--- a/crypto/src/math/ec/custom/sec/SecT409Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecT409Field.cs
@@ -40,11 +40,37 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
z[6] = x[6];
}
+ private static void AddTo(ulong[] x, ulong[] z)
+ {
+ z[0] ^= x[0];
+ z[1] ^= x[1];
+ z[2] ^= x[2];
+ z[3] ^= x[3];
+ z[4] ^= x[4];
+ z[5] ^= x[5];
+ z[6] ^= x[6];
+ }
+
public static ulong[] FromBigInteger(BigInteger x)
{
return Nat.FromBigInteger64(409, x);
}
+ public static void HalfTrace(ulong[] x, ulong[] z)
+ {
+ ulong[] tt = Nat.Create64(13);
+
+ Nat448.Copy64(x, z);
+ for (int i = 1; i < 409; i += 2)
+ {
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ AddTo(x, z);
+ }
+ }
+
public static void Invert(ulong[] x, ulong[] z)
{
if (Nat448.IsZero64(x))
diff --git a/crypto/src/math/ec/custom/sec/SecT409FieldElement.cs b/crypto/src/math/ec/custom/sec/SecT409FieldElement.cs
index 68a63312d..a9b08526a 100644
--- a/crypto/src/math/ec/custom/sec/SecT409FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecT409FieldElement.cs
@@ -150,6 +150,18 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
return new SecT409FieldElement(z);
}
+ public override ECFieldElement HalfTrace()
+ {
+ ulong[] z = Nat448.Create64();
+ SecT409Field.HalfTrace(x, z);
+ return new SecT409FieldElement(z);
+ }
+
+ public override bool HasFastTrace
+ {
+ get { return true; }
+ }
+
public override int Trace()
{
return (int)SecT409Field.Trace(x);
diff --git a/crypto/src/math/ec/custom/sec/SecT571Field.cs b/crypto/src/math/ec/custom/sec/SecT571Field.cs
index 5a91985bc..0d9b337fc 100644
--- a/crypto/src/math/ec/custom/sec/SecT571Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecT571Field.cs
@@ -55,11 +55,34 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
}
}
+ private static void AddTo(ulong[] x, ulong[] z)
+ {
+ for (int i = 0; i < 9; ++i)
+ {
+ z[i] ^= x[i];
+ }
+ }
+
public static ulong[] FromBigInteger(BigInteger x)
{
return Nat.FromBigInteger64(571, x);
}
+ public static void HalfTrace(ulong[] x, ulong[] z)
+ {
+ ulong[] tt = Nat576.CreateExt64();
+
+ Nat576.Copy64(x, z);
+ for (int i = 1; i < 571; i += 2)
+ {
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ ImplSquare(z, tt);
+ Reduce(tt, z);
+ AddTo(x, z);
+ }
+ }
+
public static void Invert(ulong[] x, ulong[] z)
{
if (Nat576.IsZero64(x))
diff --git a/crypto/src/math/ec/custom/sec/SecT571FieldElement.cs b/crypto/src/math/ec/custom/sec/SecT571FieldElement.cs
index c9f3aa5c0..22edfe0a2 100644
--- a/crypto/src/math/ec/custom/sec/SecT571FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecT571FieldElement.cs
@@ -150,6 +150,18 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
return new SecT571FieldElement(z);
}
+ public override ECFieldElement HalfTrace()
+ {
+ ulong[] z = Nat576.Create64();
+ SecT571Field.HalfTrace(x, z);
+ return new SecT571FieldElement(z);
+ }
+
+ public override bool HasFastTrace
+ {
+ get { return true; }
+ }
+
public override int Trace()
{
return (int)SecT571Field.Trace(x);
|
