Math.Raw support for custom binary curves

- Also migrate the 'raw' stuff into Math.Raw following Java build

36 files changed, 45 insertions, 4731 deletions

diff --git a/crypto/src/math/ec/ECFieldElement.cs b/crypto/src/math/ec/ECFieldElement.cs

index 27c4ba2d0..844bed649 100644
--- a/crypto/src/math/ec/ECFieldElement.cs
+++ b/crypto/src/math/ec/ECFieldElement.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC
diff --git a/crypto/src/math/ec/Mod.cs b/crypto/src/math/ec/Mod.cs
deleted file mode 100644

index 80534ca9f..000000000
--- a/crypto/src/math/ec/Mod.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using System;
-using System.Diagnostics;
-
-using Org.BouncyCastle.Crypto.Utilities;
-using Org.BouncyCastle.Utilities;
-
-namespace Org.BouncyCastle.Math.EC
-{
-    internal abstract class Mod
-    {
-        public static void Invert(uint[] p, uint[] x, uint[] z)
-        {
-            int len = p.Length;
-            if (Nat.IsZero(len, x))
-                throw new ArgumentException("cannot be 0", "x");
-            if (Nat.IsOne(len, x))
-            {
-                Array.Copy(x, 0, z, 0, len);
-                return;
-            }
-
-            uint[] u = Nat.Copy(len, x);
-            uint[] a = Nat.Create(len);
-            a[0] = 1;
-            int ac = 0;
-
-            if ((u[0] & 1) == 0)
-            {
-                InversionStep(p, u, len, a, ref ac);
-            }
-            if (Nat.IsOne(len, u))
-            {
-                InversionResult(p, ac, a, z);
-                return;
-            }
-
-            uint[] v = Nat.Copy(len, p);
-            uint[] b = Nat.Create(len);
-            int bc = 0;
-
-            int uvLen = len;
-
-            for (;;)
-            {
-                while (u[uvLen - 1] == 0 && v[uvLen - 1] == 0)
-                {
-                    --uvLen;
-                }
-
-                if (Nat.Gte(len, u, v))
-                {
-                    Nat.SubFrom(len, v, u);
-                    Debug.Assert((u[0] & 1) == 0);
-                    ac += Nat.SubFrom(len, b, a) - bc;
-                    InversionStep(p, u, uvLen, a, ref ac);
-                    if (Nat.IsOne(len, u))
-                    {
-                        InversionResult(p, ac, a, z);
-                        return;
-                    }
-                }
-                else
-                {
-                    Nat.SubFrom(len, u, v);
-                    Debug.Assert((v[0] & 1) == 0);
-                    bc += Nat.SubFrom(len, a, b) - ac;
-                    InversionStep(p, v, uvLen, b, ref bc);
-                    if (Nat.IsOne(len, v))
-                    {
-                        InversionResult(p, bc, b, z);
-                        return;
-                    }
-                }
-            }
-        }
-
-        public static uint[] Random(uint[] p)
-        {
-            int len = p.Length;
-            Random rand = new Random();
-            uint[] s = Nat.Create(len);
-
-            uint m = p[len - 1];
-            m |= m >> 1;
-            m |= m >> 2;
-            m |= m >> 4;
-            m |= m >> 8;
-            m |= m >> 16;
-
-            do
-            {
-                byte[] bytes = new byte[len << 2];
-                rand.NextBytes(bytes);
-                Pack.BE_To_UInt32(bytes, 0, s);
-                s[len - 1] &= m;
-            }
-            while (Nat.Gte(len, s, p));
-
-            return s;
-        }
-
-        public static void Add(uint[] p, uint[] x, uint[] y, uint[] z)
-        {
-            int len = p.Length;
-            uint c = Nat.Add(len, x, y, z);
-            if (c != 0)
-            {
-                Nat.SubFrom(len, p, z);
-            }
-        }
-
-        public static void Subtract(uint[] p, uint[] x, uint[] y, uint[] z)
-        {
-            int len = p.Length;
-            int c = Nat.Sub(len, x, y, z);
-            if (c != 0)
-            {
-                Nat.AddTo(len, p, z);
-            }
-        }
-
-        private static void InversionResult(uint[] p, int ac, uint[] a, uint[] z)
-        {
-            if (ac < 0)
-            {
-                Nat.Add(p.Length, a, p, z);
-            }
-            else
-            {
-                Array.Copy(a, 0, z, 0, p.Length);
-            }
-        }
-
-        private static void InversionStep(uint[] p, uint[] u, int uLen, uint[] x, ref int xc)
-        {
-            int len = p.Length;
-            int count = 0;
-            while (u[0] == 0)
-            {
-                Nat.ShiftDownWord(uLen, u, 0);
-                count += 32;
-            }
-
-            {
-                int zeroes = GetTrailingZeroes(u[0]);
-                if (zeroes > 0)
-                {
-                    Nat.ShiftDownBits(uLen, u, zeroes, 0);
-                    count += zeroes;
-                }
-            }
-
-            for (int i = 0; i < count; ++i)
-            {
-                if ((x[0] & 1) != 0)
-                {
-                    if (xc < 0)
-                    {
-                        xc += (int)Nat.AddTo(len, p, x);
-                    }
-                    else
-                    {
-                        xc += Nat.SubFrom(len, p, x);
-                    }
-                }
-
-                Debug.Assert(xc == 0 || xc == -1);
-                Nat.ShiftDownBit(len, x, (uint)xc);
-            }
-        }
-
-        private static int GetTrailingZeroes(uint x)
-        {
-            Debug.Assert(x != 0);
-            int count = 0;
-            while ((x & 1) == 0)
-            {
-                x >>= 1;
-                ++count;
-            }
-            return count;
-        }
-    }
-}
diff --git a/crypto/src/math/ec/Nat.cs b/crypto/src/math/ec/Nat.cs
deleted file mode 100644

index 17b632f26..000000000
--- a/crypto/src/math/ec/Nat.cs
+++ /dev/null
@@ -1,1013 +0,0 @@
-using System;
-using System.Diagnostics;
-
-using Org.BouncyCastle.Crypto.Utilities;
-
-namespace Org.BouncyCastle.Math.EC
-{
-    internal abstract class Nat
-    {
-        private const ulong M = 0xFFFFFFFFUL;
-
-        public static uint Add(int len, uint[] x, uint[] y, uint[] z)
-        {
-            ulong c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (ulong)x[i] + y[i];
-                z[i] = (uint)c;
-                c >>= 32;
-            }
-            return (uint)c;
-        }
-
-        public static uint Add33At(int len, uint x, uint[] z, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 2));
-            ulong c = (ulong)z[zPos + 0] + x;
-            z[zPos + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)z[zPos + 1] + 1;
-            z[zPos + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zPos + 2);
-        }
-
-        public static uint Add33At(int len, uint x, uint[] z, int zOff, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 2));
-            ulong c = (ulong)z[zOff + zPos] + x;
-            z[zOff + zPos] = (uint)c;
-            c >>= 32;
-            c += (ulong)z[zOff + zPos + 1] + 1;
-            z[zOff + zPos + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zOff, zPos + 2);
-        }
-
-        public static uint Add33To(int len, uint x, uint[] z)
-        {
-            ulong c = (ulong)z[0] + x;
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)z[1] + 1;
-            z[1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, 2);
-        }
-
-        public static uint Add33To(int len, uint x, uint[] z, int zOff)
-        {
-            ulong c = (ulong)z[zOff + 0] + x;
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)z[zOff + 1] + 1;
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zOff, 2);
-        }
-
-        public static uint AddBothTo(int len, uint[] x, uint[] y, uint[] z)
-        {
-            ulong c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (ulong)x[i] + y[i] + z[i];
-                z[i] = (uint)c;
-                c >>= 32;
-            }
-            return (uint)c;
-        }
-
-        public static uint AddBothTo(int len, uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            ulong c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (ulong)x[xOff + i] + y[yOff + i] + z[zOff + i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            return (uint)c;
-        }
-
-        public static uint AddDWordAt(int len, ulong x, uint[] z, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 2));
-            ulong c = (ulong)z[zPos + 0] + (x & M);
-            z[zPos + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)z[zPos + 1] + (x >> 32);
-            z[zPos + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zPos + 2);
-        }
-
-        public static uint AddDWordAt(int len, ulong x, uint[] z, int zOff, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 2));
-            ulong c = (ulong)z[zOff + zPos] + (x & M);
-            z[zOff + zPos] = (uint)c;
-            c >>= 32;
-            c += (ulong)z[zOff + zPos + 1] + (x >> 32);
-            z[zOff + zPos + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zOff, zPos + 2);
-        }
-
-        public static uint AddDWordTo(int len, ulong x, uint[] z)
-        {
-            ulong c = (ulong)z[0] + (x & M);
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)z[1] + (x >> 32);
-            z[1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, 2);
-        }
-
-        public static uint AddDWordTo(int len, ulong x, uint[] z, int zOff)
-        {
-            ulong c = (ulong)z[zOff + 0] + (x & M);
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)z[zOff + 1] + (x >> 32);
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zOff, 2);
-        }
-
-        public static uint AddTo(int len, uint[] x, uint[] z)
-        {
-            ulong c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (ulong)x[i] + z[i];
-                z[i] = (uint)c;
-                c >>= 32;
-            }
-            return (uint)c;
-        }
-
-        public static uint AddTo(int len, uint[] x, int xOff, uint[] z, int zOff)
-        {
-            ulong c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (ulong)x[xOff + i] + z[zOff + i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            return (uint)c;
-        }
-
-        public static uint AddWordAt(int len, uint x, uint[] z, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 1));
-            ulong c = (ulong)x + z[zPos];
-            z[zPos] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zPos + 1);
-        }
-
-        public static uint AddWordAt(int len, uint x, uint[] z, int zOff, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 1));
-            ulong c = (ulong)x + z[zOff + zPos];
-            z[zOff + zPos] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zOff, zPos + 1);
-        }
-
-        public static uint AddWordTo(int len, uint x, uint[] z)
-        {
-            ulong c = (ulong)x + z[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, 1);
-        }
-
-        public static uint AddWordTo(int len, uint x, uint[] z, int zOff)
-        {
-            ulong c = (ulong)x + z[zOff];
-            z[zOff] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zOff, 1);
-        }
-
-        public static void Copy(int len, uint[] x, uint[] z)
-        {
-            Array.Copy(x, 0, z, 0, len);
-        }
-
-        public static uint[] Copy(int len, uint[] x)
-        {
-            uint[] z = new uint[len];
-            Array.Copy(x, 0, z, 0, len);
-            return z;
-        }
-
-        public static uint[] Create(int len)
-        {
-            return new uint[len];
-        }
-
-        public static int Dec(int len, uint[] z)
-        {
-            for (int i = 0; i < len; ++i)
-            {
-                if (--z[i] != uint.MaxValue)
-                {
-                    return 0;
-                }
-            }
-            return -1;
-        }
-
-        public static int Dec(int len, uint[] x, uint[] z)
-        {
-            int i = 0;
-            while (i < len)
-            {
-                uint c = x[i] - 1;
-                z[i] = c;
-                ++i;
-                if (c != uint.MaxValue)
-                {
-                    while (i < len)
-                    {
-                        z[i] = x[i];
-                        ++i;
-                    }
-                    return 0;
-                }
-            }
-            return -1;
-        }
-
-        public static int DecAt(int len, uint[] z, int zPos)
-        {
-            Debug.Assert(zPos <= len);
-            for (int i = zPos; i < len; ++i)
-            {
-                if (--z[i] != uint.MaxValue)
-                {
-                    return 0;
-                }
-            }
-            return -1;
-        }
-
-        public static int DecAt(int len, uint[] z, int zOff, int zPos)
-        {
-            Debug.Assert(zPos <= len);
-            for (int i = zPos; i < len; ++i)
-            {
-                if (--z[zOff + i] != uint.MaxValue)
-                {
-                    return 0;
-                }
-            }
-            return -1;
-        }
-
-        public static bool Eq(int len, uint[] x, uint[] y)
-        {
-            for (int i = len - 1; i >= 0; --i)
-            {
-                if (x[i] != y[i])
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public static uint[] FromBigInteger(int bits, BigInteger x)
-        {
-            if (x.SignValue < 0 || x.BitLength > bits)
-                throw new ArgumentException();
-
-            int len = (bits + 31) >> 5;
-            uint[] z = Create(len);
-            int i = 0;
-            while (x.SignValue != 0)
-            {
-                z[i++] = (uint)x.IntValue;
-                x = x.ShiftRight(32);
-            }
-            return z;
-        }
-
-        public static uint GetBit(uint[] x, int bit)
-        {
-            if (bit == 0)
-            {
-                return x[0] & 1;
-            }
-            int w = bit >> 5;
-            if (w < 0 || w >= x.Length)
-            {
-                return 0;
-            }
-            int b = bit & 31;
-            return (x[w] >> b) & 1;
-        }
-
-        public static bool Gte(int len, uint[] x, uint[] y)
-        {
-            for (int i = len - 1; i >= 0; --i)
-            {
-                uint x_i = x[i], y_i = y[i];
-                if (x_i < y_i)
-                    return false;
-                if (x_i > y_i)
-                    return true;
-            }
-            return true;
-        }
-
-        public static uint Inc(int len, uint[] z)
-        {
-            for (int i = 0; i < len; ++i)
-            {
-                if (++z[i] != uint.MinValue)
-                {
-                    return 0;
-                }
-            }
-            return 1;
-        }
-
-        public static uint Inc(int len, uint[] x, uint[] z)
-        {
-            int i = 0;
-            while (i < len)
-            {
-                uint c = x[i] + 1;
-                z[i] = c;
-                ++i;
-                if (c != 0)
-                {
-                    while (i < len)
-                    {
-                        z[i] = x[i];
-                        ++i;
-                    }
-                    return 0;
-                }
-            }
-            return 1;
-        }
-
-        public static uint IncAt(int len, uint[] z, int zPos)
-        {
-            Debug.Assert(zPos <= len);
-            for (int i = zPos; i < len; ++i)
-            {
-                if (++z[i] != uint.MinValue)
-                {
-                    return 0;
-                }
-            }
-            return 1;
-        }
-
-        public static uint IncAt(int len, uint[] z, int zOff, int zPos)
-        {
-            Debug.Assert(zPos <= len);
-            for (int i = zPos; i < len; ++i)
-            {
-                if (++z[zOff + i] != uint.MinValue)
-                {
-                    return 0;
-                }
-            }
-            return 1;
-        }
-
-        public static bool IsOne(int len, uint[] x)
-        {
-            if (x[0] != 1)
-            {
-                return false;
-            }
-            for (int i = 1; i < len; ++i)
-            {
-                if (x[i] != 0)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public static bool IsZero(int len, uint[] x)
-        {
-            if (x[0] != 0)
-            {
-                return false;
-            }
-            for (int i = 1; i < len; ++i)
-            {
-                if (x[i] != 0)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public static void Mul(int len, uint[] x, uint[] y, uint[] zz)
-        {
-            zz[len] = (uint)MulWord(len, x[0], y, zz);
-
-            for (int i = 1; i < len; ++i)
-            {
-                zz[i + len] = (uint)MulWordAddTo(len, x[i], y, 0, zz, i);
-            }
-        }
-
-        public static void Mul(int len, uint[] x, int xOff, uint[] y, int yOff, uint[] zz, int zzOff)
-        {
-            zz[zzOff + len] = (uint)MulWord(len, x[xOff], y, yOff, zz, zzOff);
-
-            for (int i = 1; i < len; ++i)
-            {
-                zz[zzOff + i + len] = (uint)MulWordAddTo(len, x[xOff + i], y, yOff, zz, zzOff + i);
-            }
-        }
-
-        public static uint Mul31BothAdd(int len, uint a, uint[] x, uint b, uint[] y, uint[] z, int zOff)
-        {
-            ulong c = 0, aVal = (ulong)a, bVal = (ulong)b;
-            int i = 0;
-            do
-            {
-                c += aVal * x[i] + bVal * y[i] + z[zOff + i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            while (++i < len);
-            return (uint)c;
-        }
-
-        public static uint MulWord(int len, uint x, uint[] y, uint[] z)
-        {
-            ulong c = 0, xVal = (ulong)x;
-            int i = 0;
-            do
-            {
-                c += xVal * y[i];
-                z[i] = (uint)c;
-                c >>= 32;
-            }
-            while (++i < len);
-            return (uint)c;
-        }
-
-        public static uint MulWord(int len, uint x, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            ulong c = 0, xVal = (ulong)x;
-            int i = 0;
-            do
-            {
-                c += xVal * y[yOff + i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            while (++i < len);
-            return (uint)c;
-        }
-
-        public static uint MulWordAddTo(int len, uint x, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            ulong c = 0, xVal = (ulong)x;
-            int i = 0;
-            do
-            {
-                c += xVal * y[yOff + i] + z[zOff + i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            while (++i < len);
-            return (uint)c;
-        }
-
-        public static uint MulWordDwordAddAt(int len, uint x, ulong y, uint[] z, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 3));
-            ulong c = 0, xVal = (ulong)x;
-            c += xVal * (uint)y + z[zPos + 0];
-            z[zPos + 0] = (uint)c;
-            c >>= 32;
-            c += xVal * (y >> 32) + z[zPos + 1];
-            z[zPos + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)z[zPos + 2];
-            z[zPos + 2] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : IncAt(len, z, zPos + 3);
-        }
-
-        public static uint ShiftDownBit(int len, uint[] z, uint c)
-        {
-            int i = len;
-            while (--i >= 0)
-            {
-                uint next = z[i];
-                z[i] = (next >> 1) | (c << 31);
-                c = next;
-            }
-            return c << 31;
-        }
-
-        public static uint ShiftDownBit(int len, uint[] z, int zOff, uint c)
-        {
-            int i = len;
-            while (--i >= 0)
-            {
-                uint next = z[zOff + i];
-                z[zOff + i] = (next >> 1) | (c << 31);
-                c = next;
-            }
-            return c << 31;
-        }
-
-        public static uint ShiftDownBit(int len, uint[] x, uint c, uint[] z)
-        {
-            int i = len;
-            while (--i >= 0)
-            {
-                uint next = x[i];
-                z[i] = (next >> 1) | (c << 31);
-                c = next;
-            }
-            return c << 31;
-        }
-
-        public static uint ShiftDownBit(int len, uint[] x, int xOff, uint c, uint[] z, int zOff)
-        {
-            int i = len;
-            while (--i >= 0)
-            {
-                uint next = x[xOff + i];
-                z[zOff + i] = (next >> 1) | (c << 31);
-                c = next;
-            }
-            return c << 31;
-        }
-
-        public static uint ShiftDownBits(int len, uint[] z, int bits, uint c)
-        {
-            Debug.Assert(bits > 0 && bits < 32);
-            int i = len;
-            while (--i >= 0)
-            {
-                uint next = z[i];
-                z[i] = (next >> bits) | (c << -bits);
-                c = next;
-            }
-            return c << -bits;
-        }
-
-        public static uint ShiftDownBits(int len, uint[] z, int zOff, int bits, uint c)
-        {
-            Debug.Assert(bits > 0 && bits < 32);
-            int i = len;
-            while (--i >= 0)
-            {
-                uint next = z[zOff + i];
-                z[zOff + i] = (next >> bits) | (c << -bits);
-                c = next;
-            }
-            return c << -bits;
-        }
-
-        public static uint ShiftDownBits(int len, uint[] x, int bits, uint c, uint[] z)
-        {
-            Debug.Assert(bits > 0 && bits < 32);
-            int i = len;
-            while (--i >= 0)
-            {
-                uint next = x[i];
-                z[i] = (next >> bits) | (c << -bits);
-                c = next;
-            }
-            return c << -bits;
-        }
-
-        public static uint ShiftDownBits(int len, uint[] x, int xOff, int bits, uint c, uint[] z, int zOff)
-        {
-            Debug.Assert(bits > 0 && bits < 32);
-            int i = len;
-            while (--i >= 0)
-            {
-                uint next = x[xOff + i];
-                z[zOff + i] = (next >> bits) | (c << -bits);
-                c = next;
-            }
-            return c << -bits;
-        }
-
-        public static uint ShiftDownWord(int len, uint[] z, uint c)
-        {
-            int i = len;
-            while (--i >= 0)
-            {
-                uint next = z[i];
-                z[i] = c;
-                c = next;
-            }
-            return c;
-        }
-
-        public static uint ShiftUpBit(int len, uint[] z, uint c)
-        {
-            for (int i = 0; i < len; ++i)
-            {
-                uint next = z[i];
-                z[i] = (next << 1) | (c >> 31);
-                c = next;
-            }
-            return c >> 31;
-        }
-
-        public static uint ShiftUpBit(int len, uint[] z, int zOff, uint c)
-        {
-            for (int i = 0; i < len; ++i)
-            {
-                uint next = z[zOff + i];
-                z[zOff + i] = (next << 1) | (c >> 31);
-                c = next;
-            }
-            return c >> 31;
-        }
-
-        public static uint ShiftUpBit(int len, uint[] x, uint c, uint[] z)
-        {
-            for (int i = 0; i < len; ++i)
-            {
-                uint next = x[i];
-                z[i] = (next << 1) | (c >> 31);
-                c = next;
-            }
-            return c >> 31;
-        }
-
-        public static uint ShiftUpBit(int len, uint[] x, int xOff, uint c, uint[] z, int zOff)
-        {
-            for (int i = 0; i < len; ++i)
-            {
-                uint next = x[xOff + i];
-                z[zOff + i] = (next << 1) | (c >> 31);
-                c = next;
-            }
-            return c >> 31;
-        }
-
-        public static uint ShiftUpBits(int len, uint[] z, int bits, uint c)
-        {
-            Debug.Assert(bits > 0 && bits < 32);
-            for (int i = 0; i < len; ++i)
-            {
-                uint next = z[i];
-                z[i] = (next << bits) | (c >> -bits);
-                c = next;
-            }
-            return c >> -bits;
-        }
-
-        public static uint ShiftUpBits(int len, uint[] z, int zOff, int bits, uint c)
-        {
-            Debug.Assert(bits > 0 && bits < 32);
-            for (int i = 0; i < len; ++i)
-            {
-                uint next = z[zOff + i];
-                z[zOff + i] = (next << bits) | (c >> -bits);
-                c = next;
-            }
-            return c >> -bits;
-        }
-
-        public static uint ShiftUpBits(int len, uint[] x, int bits, uint c, uint[] z)
-        {
-            Debug.Assert(bits > 0 && bits < 32);
-            for (int i = 0; i < len; ++i)
-            {
-                uint next = x[i];
-                z[i] = (next << bits) | (c >> -bits);
-                c = next;
-            }
-            return c >> -bits;
-        }
-
-        public static uint ShiftUpBits(int len, uint[] x, int xOff, int bits, uint c, uint[] z, int zOff)
-        {
-            Debug.Assert(bits > 0 && bits < 32);
-            for (int i = 0; i < len; ++i)
-            {
-                uint next = x[xOff + i];
-                z[zOff + i] = (next << bits) | (c >> -bits);
-                c = next;
-            }
-            return c >> -bits;
-        }
-
-        public static void Square(int len, uint[] x, uint[] zz)
-        {
-            int extLen = len << 1;
-            uint c = 0;
-            int j = len, k = extLen;
-            do
-            {
-                ulong xVal = (ulong)x[--j];
-                ulong p = xVal * xVal;
-                zz[--k] = (c << 31) | (uint)(p >> 33);
-                zz[--k] = (uint)(p >> 1);
-                c = (uint)p;
-            }
-            while (j > 0);
-
-            for (int i = 1; i < len; ++i)
-            {
-                c = SquareWordAdd(x, i, zz);
-                AddWordAt(extLen, c, zz, i << 1);
-            }
-
-            ShiftUpBit(extLen, zz, x[0] << 31);
-        }
-
-        public static void Square(int len, uint[] x, int xOff, uint[] zz, int zzOff)
-        {
-            int extLen = len << 1;
-            uint c = 0;
-            int j = len, k = extLen;
-            do
-            {
-                ulong xVal = (ulong)x[xOff + --j];
-                ulong p = xVal * xVal;
-                zz[zzOff + --k] = (c << 31) | (uint)(p >> 33);
-                zz[zzOff + --k] = (uint)(p >> 1);
-                c = (uint)p;
-            }
-            while (j > 0);
-
-            for (int i = 1; i < len; ++i)
-            {
-                c = SquareWordAdd(x, xOff, i, zz, zzOff);
-                AddWordAt(extLen, c, zz, zzOff, i << 1);
-            }
-
-            ShiftUpBit(extLen, zz, zzOff, x[xOff] << 31);
-        }
-
-        public static uint SquareWordAdd(uint[] x, int xPos, uint[] z)
-        {
-            ulong c = 0, xVal = (ulong)x[xPos];
-            int i = 0;
-            do
-            {
-                c += xVal * x[i] + z[xPos + i];
-                z[xPos + i] = (uint)c;
-                c >>= 32;
-            }
-            while (++i < xPos);
-            return (uint)c;
-        }
-
-        public static uint SquareWordAdd(uint[] x, int xOff, int xPos, uint[] z, int zOff)
-        {
-            ulong c = 0, xVal = (ulong)x[xOff + xPos];
-            int i = 0;
-            do
-            {
-                c += xVal * (x[xOff + i] & M) + (z[xPos + zOff] & M);
-                z[xPos + zOff] = (uint)c;
-                c >>= 32;
-                ++zOff;
-            }
-            while (++i < xPos);
-            return (uint)c;
-        }
-
-        public static int Sub(int len, uint[] x, uint[] y, uint[] z)
-        {
-            long c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (long)x[i] - y[i];
-                z[i] = (uint)c;
-                c >>= 32;
-            }
-            return (int)c;
-        }
-
-        public static int Sub(int len, uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            long c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (long)x[xOff + i] - y[yOff + i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            return (int)c;
-        }
-        public static int Sub33At(int len, uint x, uint[] z, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 2));
-            long c = (long)z[zPos + 0] - x;
-            z[zPos + 0] = (uint)c;
-            c >>= 32;
-            c += (long)z[zPos + 1] - 1;
-            z[zPos + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, zPos + 2);
-        }
-
-        public static int Sub33At(int len, uint x, uint[] z, int zOff, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 2));
-            long c = (long)z[zOff + zPos] - x;
-            z[zOff + zPos] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + zPos + 1] - 1;
-            z[zOff + zPos + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, zOff, zPos + 2);
-        }
-
-        public static int Sub33From(int len, uint x, uint[] z)
-        {
-            long c = (long)z[0] - x;
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)z[1] - 1;
-            z[1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, 2);
-        }
-
-        public static int Sub33From(int len, uint x, uint[] z, int zOff)
-        {
-            long c = (long)z[zOff + 0] - x;
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 1] - 1;
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, zOff, 2);
-        }
-
-        public static int SubBothFrom(int len, uint[] x, uint[] y, uint[] z)
-        {
-            long c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (long)z[i] - x[i] - y[i];
-                z[i] = (uint)c;
-                c >>= 32;
-            }
-            return (int)c;
-        }
-
-        public static int SubBothFrom(int len, uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            long c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (long)z[zOff + i] - x[xOff + i] - y[yOff + i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            return (int)c;
-        }
-
-        public static int SubDWordAt(int len, ulong x, uint[] z, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 2));
-            long c = (long)z[zPos + 0] - (long)(x & M);
-            z[zPos + 0] = (uint)c;
-            c >>= 32;
-            c += (long)z[zPos + 1] - (long)(x >> 32);
-            z[zPos + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, zPos + 2);
-        }
-
-        public static int SubDWordAt(int len, ulong x, uint[] z, int zOff, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 2));
-            long c = (long)z[zOff + zPos] - (long)(x & M);
-            z[zOff + zPos] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + zPos + 1] - (long)(x >> 32);
-            z[zOff + zPos + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z,  zOff, zPos + 2);
-        }
-
-        public static int SubDWordFrom(int len, ulong x, uint[] z)
-        {
-            long c = (long)z[0] - (long)(x & M);
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)z[1] - (long)(x >> 32);
-            z[1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, 2);
-        }
-
-        public static int SubDWordFrom(int len, ulong x, uint[] z, int zOff)
-        {
-            long c = (long)z[zOff + 0] - (long)(x & M);
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 1] - (long)(x >> 32);
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, zOff, 2);
-        }
-
-        public static int SubFrom(int len, uint[] x, uint[] z)
-        {
-            long c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (long)z[i] - x[i];
-                z[i] = (uint)c;
-                c >>= 32;
-            }
-            return (int)c;
-        }
-
-        public static int SubFrom(int len, uint[] x, int xOff, uint[] z, int zOff)
-        {
-            long c = 0;
-            for (int i = 0; i < len; ++i)
-            {
-                c += (long)z[zOff + i] - x[xOff + i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            return (int)c;
-        }
-
-        public static int SubWordAt(int len, uint x, uint[] z, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 1));
-            long c = (long)z[zPos] - x;
-            z[zPos] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, zPos + 1);
-        }
-
-        public static int SubWordAt(int len, uint x, uint[] z, int zOff, int zPos)
-        {
-            Debug.Assert(zPos <= (len - 1));
-            long c = (long)z[zOff + zPos] - x;
-            z[zOff + zPos] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, zOff, zPos + 1);
-        }
-
-        public static int SubWordFrom(int len, uint x, uint[] z)
-        {
-            long c = (long)z[0] - x;
-            z[0] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, 1);
-        }
-
-        public static int SubWordFrom(int len, uint x, uint[] z, int zOff)
-        {
-            long c = (long)z[zOff + 0] - x;
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : DecAt(len, z, zOff, 1);
-        }
-
-        public static BigInteger ToBigInteger(int len, uint[] x)
-        {
-            byte[] bs = new byte[len << 2];
-            for (int i = 0; i < len; ++i)
-            {
-                uint x_i = x[i];
-                if (x_i != 0)
-                {
-                    Pack.UInt32_To_BE(x_i, bs, (len - 1 - i) << 2);
-                }
-            }
-            return new BigInteger(1, bs);
-        }
-
-        public static void Zero(int len, uint[] z)
-        {
-            for (int i = 0; i < len; ++i)
-            {
-                z[i] = 0;
-            }
-        }
-    }
-}
diff --git a/crypto/src/math/ec/custom/djb/Curve25519.cs b/crypto/src/math/ec/custom/djb/Curve25519.cs

index 712b68f29..6ed7c0648 100644
--- a/crypto/src/math/ec/custom/djb/Curve25519.cs
+++ b/crypto/src/math/ec/custom/djb/Curve25519.cs
@@ -1,6 +1,6 @@
 using System;
 
-using Org.BouncyCastle.Math.EC.Custom.Sec;
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities.Encoders;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Djb
diff --git a/crypto/src/math/ec/custom/djb/Curve25519Field.cs b/crypto/src/math/ec/custom/djb/Curve25519Field.cs

index 809e51b80..837821e1a 100644
--- a/crypto/src/math/ec/custom/djb/Curve25519Field.cs
+++ b/crypto/src/math/ec/custom/djb/Curve25519Field.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics;
 
-using Org.BouncyCastle.Math.EC.Custom.Sec;
+using Org.BouncyCastle.Math.Raw;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Djb
 {
diff --git a/crypto/src/math/ec/custom/djb/Curve25519FieldElement.cs b/crypto/src/math/ec/custom/djb/Curve25519FieldElement.cs

index 8d5a80326..732e9e468 100644
--- a/crypto/src/math/ec/custom/djb/Curve25519FieldElement.cs
+++ b/crypto/src/math/ec/custom/djb/Curve25519FieldElement.cs
@@ -1,6 +1,6 @@
 using System;
 
-using Org.BouncyCastle.Math.EC.Custom.Sec;
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Djb
diff --git a/crypto/src/math/ec/custom/djb/Curve25519Point.cs b/crypto/src/math/ec/custom/djb/Curve25519Point.cs

index bfec1d11d..eb8fc12f2 100644
--- a/crypto/src/math/ec/custom/djb/Curve25519Point.cs
+++ b/crypto/src/math/ec/custom/djb/Curve25519Point.cs
@@ -1,6 +1,6 @@
 using System;
 
-using Org.BouncyCastle.Math.EC.Custom.Sec;
+using Org.BouncyCastle.Math.Raw;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Djb
 {
diff --git a/crypto/src/math/ec/custom/sec/Nat192.cs b/crypto/src/math/ec/custom/sec/Nat192.cs
deleted file mode 100644

index 94d7ed17c..000000000
--- a/crypto/src/math/ec/custom/sec/Nat192.cs
+++ /dev/null
@@ -1,962 +0,0 @@
-using System;
-using System.Diagnostics;
-
-using Org.BouncyCastle.Crypto.Utilities;
-
-namespace Org.BouncyCastle.Math.EC.Custom.Sec
-{
-    internal abstract class Nat192
-    {
-        private const ulong M = 0xFFFFFFFFUL;
-
-        public static uint Add(uint[] x, uint[] y, uint[] z)
-        {
-            ulong c = 0;
-            c += (ulong)x[0] + y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[1] + y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[2] + y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[3] + y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[4] + y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[5] + y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddBothTo(uint[] x, uint[] y, uint[] z)
-        {
-            ulong c = 0;
-            c += (ulong)x[0] + y[0] + z[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[1] + y[1] + z[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[2] + y[2] + z[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[3] + y[3] + z[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[4] + y[4] + z[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[5] + y[5] + z[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddTo(uint[] x, uint[] z)
-        {
-            ulong c = 0;
-            c += (ulong)x[0] + z[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[1] + z[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[2] + z[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[3] + z[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[4] + z[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[5] + z[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddTo(uint[] x, int xOff, uint[] z, int zOff, uint cIn)
-        {
-            ulong c = cIn;
-            c += (ulong)x[xOff + 0] + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 1] + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 2] + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 3] + z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 4] + z[zOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 5] + z[zOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddToEachOther(uint[] u, int uOff, uint[] v, int vOff)
-        {
-            ulong c = 0;
-            c += (ulong)u[uOff + 0] + v[vOff + 0];
-            u[uOff + 0] = (uint)c;
-            v[vOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 1] + v[vOff + 1];
-            u[uOff + 1] = (uint)c;
-            v[vOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 2] + v[vOff + 2];
-            u[uOff + 2] = (uint)c;
-            v[vOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 3] + v[vOff + 3];
-            u[uOff + 3] = (uint)c;
-            v[vOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 4] + v[vOff + 4];
-            u[uOff + 4] = (uint)c;
-            v[vOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 5] + v[vOff + 5];
-            u[uOff + 5] = (uint)c;
-            v[vOff + 5] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static void Copy(uint[] x, uint[] 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];
-        }
-
-        public static uint[] Create()
-        {
-            return new uint[6];
-        }
-
-        public static uint[] CreateExt()
-        {
-            return new uint[12];
-        }
-
-        public static bool Diff(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            bool pos = Gte(x, xOff, y, yOff);
-            if (pos)
-            {
-                Sub(x, xOff, y, yOff, z, zOff);
-            }
-            else
-            {
-                Sub(y, yOff, x, xOff, z, zOff);
-            }
-            return pos;
-        }
-
-        public static bool Eq(uint[] x, uint[] y)
-        {
-            for (int i = 5; i >= 0; --i)
-            {
-                if (x[i] != y[i])
-                    return false;
-            }
-            return true;
-        }
-
-        public static uint[] FromBigInteger(BigInteger x)
-        {
-            if (x.SignValue < 0 || x.BitLength > 192)
-                throw new ArgumentException();
-
-            uint[] z = Create();
-            int i = 0;
-            while (x.SignValue != 0)
-            {
-                z[i++] = (uint)x.IntValue;
-                x = x.ShiftRight(32);
-            }
-            return z;
-        }
-
-        public static uint GetBit(uint[] x, int bit)
-        {
-            if (bit == 0)
-            {
-                return x[0] & 1;
-            }
-            int w = bit >> 5;
-            if (w < 0 || w >= 6)
-            {
-                return 0;
-            }
-            int b = bit & 31;
-            return (x[w] >> b) & 1;
-        }
-
-        public static bool Gte(uint[] x, uint[] y)
-        {
-            for (int i = 5; i >= 0; --i)
-            {
-                uint x_i = x[i], y_i = y[i];
-                if (x_i < y_i)
-                    return false;
-                if (x_i > y_i)
-                    return true;
-            }
-            return true;
-        }
-
-        public static bool Gte(uint[] x, int xOff, uint[] y, int yOff)
-        {
-            for (int i = 5; i >= 0; --i)
-            {
-                uint x_i = x[xOff + i], y_i = y[yOff + i];
-                if (x_i < y_i)
-                    return false;
-                if (x_i > y_i)
-                    return true;
-            }
-            return true;
-        }
-
-        public static bool IsOne(uint[] x)
-        {
-            if (x[0] != 1)
-            {
-                return false;
-            }
-            for (int i = 1; i < 6; ++i)
-            {
-                if (x[i] != 0)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public static bool IsZero(uint[] x)
-        {
-            for (int i = 0; i < 6; ++i)
-            {
-                if (x[i] != 0)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public static void Mul(uint[] x, uint[] y, uint[] zz)
-        {
-            ulong y_0 = y[0];
-            ulong y_1 = y[1];
-            ulong y_2 = y[2];
-            ulong y_3 = y[3];
-            ulong y_4 = y[4];
-            ulong y_5 = y[5];
-
-            {
-                ulong c = 0, x_0 = x[0];
-                c += x_0 * y_0;
-                zz[0] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_1;
-                zz[1] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_2;
-                zz[2] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_3;
-                zz[3] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_4;
-                zz[4] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_5;
-                zz[5] = (uint)c;
-                c >>= 32;
-                zz[6] = (uint)c;
-            }
-
-            for (int i = 1; i < 6; ++i)
-            {
-                ulong c = 0, x_i = x[i];
-                c += x_i * y_0 + zz[i + 0];
-                zz[i + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[i + 1];
-                zz[i + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[i + 2];
-                zz[i + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[i + 3];
-                zz[i + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[i + 4];
-                zz[i + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[i + 5];
-                zz[i + 5] = (uint)c;
-                c >>= 32;
-                zz[i + 6] = (uint)c;
-            }
-        }
-
-        public static void Mul(uint[] x, int xOff, uint[] y, int yOff, uint[] zz, int zzOff)
-        {
-            ulong y_0 = y[yOff + 0];
-            ulong y_1 = y[yOff + 1];
-            ulong y_2 = y[yOff + 2];
-            ulong y_3 = y[yOff + 3];
-            ulong y_4 = y[yOff + 4];
-            ulong y_5 = y[yOff + 5];
-
-            {
-                ulong c = 0, x_0 = x[xOff + 0];
-                c += x_0 * y_0;
-                zz[zzOff + 0] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_1;
-                zz[zzOff + 1] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_2;
-                zz[zzOff + 2] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_3;
-                zz[zzOff + 3] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_4;
-                zz[zzOff + 4] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_5;
-                zz[zzOff + 5] = (uint)c;
-                c >>= 32;
-                zz[zzOff + 6] = (uint)c;
-            }
-
-            for (int i = 1; i < 6; ++i)
-            {
-                ++zzOff;
-                ulong c = 0, x_i = x[xOff + i];
-                c += x_i * y_0 + zz[zzOff + 0];
-                zz[zzOff + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[zzOff + 1];
-                zz[zzOff + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[zzOff + 2];
-                zz[zzOff + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[zzOff + 3];
-                zz[zzOff + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[zzOff + 4];
-                zz[zzOff + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[zzOff + 5];
-                zz[zzOff + 5] = (uint)c;
-                c >>= 32;
-                zz[zzOff + 6] = (uint)c;
-            }
-        }
-
-        public static uint MulAddTo(uint[] x, uint[] y, uint[] zz)
-        {
-            ulong y_0 = y[0];
-            ulong y_1 = y[1];
-            ulong y_2 = y[2];
-            ulong y_3 = y[3];
-            ulong y_4 = y[4];
-            ulong y_5 = y[5];
-
-            ulong zc = 0;
-            for (int i = 0; i < 6; ++i)
-            {
-                ulong c = 0, x_i = x[i];
-                c += x_i * y_0 + zz[i + 0];
-                zz[i + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[i + 1];
-                zz[i + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[i + 2];
-                zz[i + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[i + 3];
-                zz[i + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[i + 4];
-                zz[i + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[i + 5];
-                zz[i + 5] = (uint)c;
-                c >>= 32;
-                c += zc + zz[i + 6];
-                zz[i + 6] = (uint)c;
-                zc = c >> 32;
-            }
-            return (uint)zc;
-        }
-
-        public static uint MulAddTo(uint[] x, int xOff, uint[] y, int yOff, uint[] zz, int zzOff)
-        {
-            ulong y_0 = y[yOff + 0];
-            ulong y_1 = y[yOff + 1];
-            ulong y_2 = y[yOff + 2];
-            ulong y_3 = y[yOff + 3];
-            ulong y_4 = y[yOff + 4];
-            ulong y_5 = y[yOff + 5];
-
-            ulong zc = 0;
-            for (int i = 0; i < 6; ++i)
-            {
-                ulong c = 0, x_i = x[xOff + i];
-                c += x_i * y_0 + zz[zzOff + 0];
-                zz[zzOff + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[zzOff + 1];
-                zz[zzOff + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[zzOff + 2];
-                zz[zzOff + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[zzOff + 3];
-                zz[zzOff + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[zzOff + 4];
-                zz[zzOff + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[zzOff + 5];
-                zz[zzOff + 5] = (uint)c;
-                c >>= 32;
-                c += zc + zz[zzOff + 6];
-                zz[zzOff + 6] = (uint)c;
-                zc = c >> 32;
-                ++zzOff;
-            }
-            return (uint)zc;
-        }
-
-        public static ulong Mul33Add(uint w, uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            Debug.Assert(w >> 31 == 0);
-
-            ulong c = 0, wVal = w;
-            ulong x0 = x[xOff + 0];
-            c += wVal * x0 + y[yOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            ulong x1 = x[xOff + 1];
-            c += wVal * x1 + x0 + y[yOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            ulong x2 = x[xOff + 2];
-            c += wVal * x2 + x1 + y[yOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            ulong x3 = x[xOff + 3];
-            c += wVal * x3 + x2 + y[yOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            ulong x4 = x[xOff + 4];
-            c += wVal * x4 + x3 + y[yOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            ulong x5 = x[xOff + 5];
-            c += wVal * x5 + x4 + y[yOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += x5;
-            return c;
-        }
-
-        public static uint MulWordAddExt(uint x, uint[] yy, int yyOff, uint[] zz, int zzOff)
-        {
-            Debug.Assert(yyOff <= 6);
-            Debug.Assert(zzOff <= 6);
-            ulong c = 0, xVal = x;
-            c += xVal * yy[yyOff + 0] + zz[zzOff + 0];
-            zz[zzOff + 0] = (uint)c;
-            c >>= 32;
-            c += xVal * yy[yyOff + 1] + zz[zzOff + 1];
-            zz[zzOff + 1] = (uint)c;
-            c >>= 32;
-            c += xVal * yy[yyOff + 2] + zz[zzOff + 2];
-            zz[zzOff + 2] = (uint)c;
-            c >>= 32;
-            c += xVal * yy[yyOff + 3] + zz[zzOff + 3];
-            zz[zzOff + 3] = (uint)c;
-            c >>= 32;
-            c += xVal * yy[yyOff + 4] + zz[zzOff + 4];
-            zz[zzOff + 4] = (uint)c;
-            c >>= 32;
-            c += xVal * yy[yyOff + 5] + zz[zzOff + 5];
-            zz[zzOff + 5] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint Mul33DWordAdd(uint x, ulong y, uint[] z, int zOff)
-        {
-            Debug.Assert(x >> 31 == 0);
-            Debug.Assert(zOff <= 2);
-            ulong c = 0, xVal = x;
-            ulong y00 = y & M;
-            c += xVal * y00 + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            ulong y01 = y >> 32;
-            c += xVal * y01 + y00 + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += y01 + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : Nat.IncAt(6, z, zOff, 4);
-        }
-
-        public static uint Mul33WordAdd(uint x, uint y, uint[] z, int zOff)
-        {
-            Debug.Assert(x >> 31 == 0);
-            Debug.Assert(zOff <=3);
-            ulong c = 0, yVal = y;
-            c += yVal * x + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += yVal + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : Nat.IncAt(6, z, zOff, 3);
-        }
-
-        public static uint MulWordDwordAdd(uint x, ulong y, uint[] z, int zOff)
-        {
-            Debug.Assert(zOff <= 3);
-            ulong c = 0, xVal = x;
-            c += xVal * y + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += xVal * (y >> 32) + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : Nat.IncAt(6, z, zOff, 3);
-        }
-
-        public static uint MulWord(uint x, uint[] y, uint[] z, int zOff)
-        {
-            ulong c = 0, xVal = x;
-            int i = 0;
-            do
-            {
-                c += xVal * y[i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            while (++i < 6);
-            return (uint)c;
-        }
-
-        public static void Square(uint[] x, uint[] zz)
-        {
-            ulong x_0 = x[0];
-            ulong zz_1;
-
-            uint c = 0, w;
-            {
-                int i = 5, j = 12;
-                do
-                {
-                    ulong xVal = x[i--];
-                    ulong p = xVal * xVal;
-                    zz[--j] = (c << 31) | (uint)(p >> 33);
-                    zz[--j] = (uint)(p >> 1);
-                    c = (uint)p;
-                }
-                while (i > 0);
-
-                {
-                    ulong p = x_0 * x_0;
-                    zz_1 = (ulong)(c << 31) | (p >> 33);
-                    zz[0] = (uint)p;
-                    c = (uint)(p >> 32) & 1;
-                }
-            }
-
-            ulong x_1 = x[1];
-            ulong zz_2 = zz[2];
-
-            {
-                zz_1 += x_1 * x_0;
-                w = (uint)zz_1;
-                zz[1] = (w << 1) | c;
-                c = w >> 31;
-                zz_2 += zz_1 >> 32;
-            }
-
-            ulong x_2 = x[2];
-            ulong zz_3 = zz[3];
-            ulong zz_4 = zz[4];
-            {
-                zz_2 += x_2 * x_0;
-                w = (uint)zz_2;
-                zz[2] = (w << 1) | c;
-                c = w >> 31;
-                zz_3 += (zz_2 >> 32) + x_2 * x_1;
-                zz_4 += zz_3 >> 32;
-                zz_3 &= M;
-            }
-
-            ulong x_3 = x[3];
-            ulong zz_5 = zz[5];
-            ulong zz_6 = zz[6];
-            {
-                zz_3 += x_3 * x_0;
-                w = (uint)zz_3;
-                zz[3] = (w << 1) | c;
-                c = w >> 31;
-                zz_4 += (zz_3 >> 32) + x_3 * x_1;
-                zz_5 += (zz_4 >> 32) + x_3 * x_2;
-                zz_4 &= M;
-                zz_6 += zz_5 >> 32;
-                zz_5 &= M;
-            }
-
-            ulong x_4 = x[4];
-            ulong zz_7 = zz[7];
-            ulong zz_8 = zz[8];
-            {
-                zz_4 += x_4 * x_0;
-                w = (uint)zz_4;
-                zz[4] = (w << 1) | c;
-                c = w >> 31;
-                zz_5 += (zz_4 >> 32) + x_4 * x_1;
-                zz_6 += (zz_5 >> 32) + x_4 * x_2;
-                zz_5 &= M;
-                zz_7 += (zz_6 >> 32) + x_4 * x_3;
-                zz_6 &= M;
-                zz_8 += zz_7 >> 32;
-                zz_7 &= M;
-            }
-
-            ulong x_5 = x[5];
-            ulong zz_9 = zz[9];
-            ulong zz_10 = zz[10];
-            {
-                zz_5 += x_5 * x_0;
-                w = (uint)zz_5;
-                zz[5] = (w << 1) | c;
-                c = w >> 31;
-                zz_6 += (zz_5 >> 32) + x_5 * x_1;
-                zz_7 += (zz_6 >> 32) + x_5 * x_2;
-                zz_8 += (zz_7 >> 32) + x_5 * x_3;
-                zz_9 += (zz_8 >> 32) + x_5 * x_4;
-                zz_10 += zz_9 >> 32;
-            }
-
-            w = (uint)zz_6;
-            zz[6] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_7;
-            zz[7] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_8;
-            zz[8] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_9;
-            zz[9] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_10;
-            zz[10] = (w << 1) | c;
-            c = w >> 31;
-            w = zz[11] + (uint)(zz_10 >> 32);
-            zz[11] = (w << 1) | c;
-        }
-
-        public static void Square(uint[] x, int xOff, uint[] zz, int zzOff)
-        {
-            ulong x_0 = x[xOff + 0];
-            ulong zz_1;
-
-            uint c = 0, w;
-            {
-                int i = 5, j = 12;
-                do
-                {
-                    ulong xVal = x[xOff + i--];
-                    ulong p = xVal * xVal;
-                    zz[zzOff + --j] = (c << 31) | (uint)(p >> 33);
-                    zz[zzOff + --j] = (uint)(p >> 1);
-                    c = (uint)p;
-                }
-                while (i > 0);
-
-                {
-                    ulong p = x_0 * x_0;
-                    zz_1 = (ulong)(c << 31) | (p >> 33);
-                    zz[zzOff + 0] = (uint)p;
-                    c = (uint)(p >> 32) & 1;
-                }
-            }
-
-            ulong x_1 = x[xOff + 1];
-            ulong zz_2 = zz[zzOff + 2];
-
-            {
-                zz_1 += x_1 * x_0;
-                w = (uint)zz_1;
-                zz[zzOff + 1] = (w << 1) | c;
-                c = w >> 31;
-                zz_2 += zz_1 >> 32;
-            }
-
-            ulong x_2 = x[xOff + 2];
-            ulong zz_3 = zz[zzOff + 3];
-            ulong zz_4 = zz[zzOff + 4];
-            {
-                zz_2 += x_2 * x_0;
-                w = (uint)zz_2;
-                zz[zzOff + 2] = (w << 1) | c;
-                c = w >> 31;
-                zz_3 += (zz_2 >> 32) + x_2 * x_1;
-                zz_4 += zz_3 >> 32;
-                zz_3 &= M;
-            }
-
-            ulong x_3 = x[xOff + 3];
-            ulong zz_5 = zz[zzOff + 5];
-            ulong zz_6 = zz[zzOff + 6];
-            {
-                zz_3 += x_3 * x_0;
-                w = (uint)zz_3;
-                zz[zzOff + 3] = (w << 1) | c;
-                c = w >> 31;
-                zz_4 += (zz_3 >> 32) + x_3 * x_1;
-                zz_5 += (zz_4 >> 32) + x_3 * x_2;
-                zz_4 &= M;
-                zz_6 += zz_5 >> 32;
-                zz_5 &= M;
-            }
-
-            ulong x_4 = x[xOff + 4];
-            ulong zz_7 = zz[zzOff + 7];
-            ulong zz_8 = zz[zzOff + 8];
-            {
-                zz_4 += x_4 * x_0;
-                w = (uint)zz_4;
-                zz[zzOff + 4] = (w << 1) | c;
-                c = w >> 31;
-                zz_5 += (zz_4 >> 32) + x_4 * x_1;
-                zz_6 += (zz_5 >> 32) + x_4 * x_2;
-                zz_5 &= M;
-                zz_7 += (zz_6 >> 32) + x_4 * x_3;
-                zz_6 &= M;
-                zz_8 += zz_7 >> 32;
-                zz_7 &= M;
-            }
-
-            ulong x_5 = x[xOff + 5];
-            ulong zz_9 = zz[zzOff + 9];
-            ulong zz_10 = zz[zzOff + 10];
-            {
-                zz_5 += x_5 * x_0;
-                w = (uint)zz_5;
-                zz[zzOff + 5] = (w << 1) | c;
-                c = w >> 31;
-                zz_6 += (zz_5 >> 32) + x_5 * x_1;
-                zz_7 += (zz_6 >> 32) + x_5 * x_2;
-                zz_8 += (zz_7 >> 32) + x_5 * x_3;
-                zz_9 += (zz_8 >> 32) + x_5 * x_4;
-                zz_10 += zz_9 >> 32;
-            }
-
-            w = (uint)zz_6;
-            zz[zzOff + 6] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_7;
-            zz[zzOff + 7] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_8;
-            zz[zzOff + 8] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_9;
-            zz[zzOff + 9] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_10;
-            zz[zzOff + 10] = (w << 1) | c;
-            c = w >> 31;
-            w = zz[zzOff + 11] + (uint)(zz_10 >> 32);
-            zz[zzOff + 11] = (w << 1) | c;
-        }
-
-        public static int Sub(uint[] x, uint[] y, uint[] z)
-        {
-            long c = 0;
-            c += (long)x[0] - y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)x[1] - y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (long)x[2] - y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (long)x[3] - y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (long)x[4] - y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (long)x[5] - y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int Sub(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            long c = 0;
-            c += (long)x[xOff + 0] - y[yOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 1] - y[yOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 2] - y[yOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 3] - y[yOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 4] - y[yOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 5] - y[yOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int SubBothFrom(uint[] x, uint[] y, uint[] z)
-        {
-            long c = 0;
-            c += (long)z[0] - x[0] - y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)z[1] - x[1] - y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (long)z[2] - x[2] - y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (long)z[3] - x[3] - y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (long)z[4] - x[4] - y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (long)z[5] - x[5] - y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int SubFrom(uint[] x, uint[] z)
-        {
-            long c = 0;
-            c += (long)z[0] - x[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)z[1] - x[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (long)z[2] - x[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (long)z[3] - x[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (long)z[4] - x[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (long)z[5] - x[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int SubFrom(uint[] x, int xOff, uint[] z, int zOff)
-        {
-            long c = 0;
-            c += (long)z[zOff + 0] - x[xOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 1] - x[xOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 2] - x[xOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 3] - x[xOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 4] - x[xOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 5] - x[xOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static BigInteger ToBigInteger(uint[] x)
-        {
-            byte[] bs = new byte[24];
-            for (int i = 0; i < 6; ++i)
-            {
-                uint x_i = x[i];
-                if (x_i != 0)
-                {
-                    Pack.UInt32_To_BE(x_i, bs, (5 - i) << 2);
-                }
-            }
-            return new BigInteger(1, bs);
-        }
-
-        public static void Zero(uint[] z)
-        {
-            z[0] = 0;
-            z[1] = 0;
-            z[2] = 0;
-            z[3] = 0;
-            z[4] = 0;
-            z[5] = 0;
-        }
-    }
-}
diff --git a/crypto/src/math/ec/custom/sec/Nat224.cs b/crypto/src/math/ec/custom/sec/Nat224.cs
deleted file mode 100644

index d5b916a54..000000000
--- a/crypto/src/math/ec/custom/sec/Nat224.cs
+++ /dev/null
@@ -1,1176 +0,0 @@
-using System;
-using System.Diagnostics;
-
-using Org.BouncyCastle.Crypto.Utilities;
-
-namespace Org.BouncyCastle.Math.EC.Custom.Sec
-{
-    internal abstract class Nat224
-    {
-        private const ulong M = 0xFFFFFFFFUL;
-
-        public static uint Add(uint[] x, uint[] y, uint[] z)
-        {
-            ulong c = 0;
-            c += (ulong)x[0] + y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[1] + y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[2] + y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[3] + y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[4] + y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[5] + y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[6] + y[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint Add(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            ulong c = 0;
-            c += (ulong)x[xOff + 0] + y[yOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 1] + y[yOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 2] + y[yOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 3] + y[yOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 4] + y[yOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 5] + y[yOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 6] + y[yOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddBothTo(uint[] x, uint[] y, uint[] z)
-        {
-            ulong c = 0;
-            c += (ulong)x[0] + y[0] + z[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[1] + y[1] + z[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[2] + y[2] + z[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[3] + y[3] + z[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[4] + y[4] + z[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[5] + y[5] + z[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[6] + y[6] + z[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddBothTo(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            ulong c = 0;
-            c += (ulong)x[xOff + 0] + y[yOff + 0] + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 1] + y[yOff + 1] + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 2] + y[yOff + 2] + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 3] + y[yOff + 3] + z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 4] + y[yOff + 4] + z[zOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 5] + y[yOff + 5] + z[zOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 6] + y[yOff + 6] + z[zOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddTo(uint[] x, uint[] z)
-        {
-            ulong c = 0;
-            c += (ulong)x[0] + z[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[1] + z[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[2] + z[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[3] + z[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[4] + z[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[5] + z[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[6] + z[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddTo(uint[] x, int xOff, uint[] z, int zOff, uint cIn)
-        {
-            ulong c = cIn;
-            c += (ulong)x[xOff + 0] + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 1] + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 2] + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 3] + z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 4] + z[zOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 5] + z[zOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 6] + z[zOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddToEachOther(uint[] u, int uOff, uint[] v, int vOff)
-        {
-            ulong c = 0;
-            c += (ulong)u[uOff + 0] + v[vOff + 0];
-            u[uOff + 0] = (uint)c;
-            v[vOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 1] + v[vOff + 1];
-            u[uOff + 1] = (uint)c;
-            v[vOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 2] + v[vOff + 2];
-            u[uOff + 2] = (uint)c;
-            v[vOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 3] + v[vOff + 3];
-            u[uOff + 3] = (uint)c;
-            v[vOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 4] + v[vOff + 4];
-            u[uOff + 4] = (uint)c;
-            v[vOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 5] + v[vOff + 5];
-            u[uOff + 5] = (uint)c;
-            v[vOff + 5] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 6] + v[vOff + 6];
-            u[uOff + 6] = (uint)c;
-            v[vOff + 6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static void Copy(uint[] x, uint[] 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 uint[] Create()
-        {
-            return new uint[7];
-        }
-
-        public static uint[] CreateExt()
-        {
-            return new uint[14];
-        }
-
-        public static bool Diff(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            bool pos = Gte(x, xOff, y, yOff);
-            if (pos)
-            {
-                Sub(x, xOff, y, yOff, z, zOff);
-            }
-            else
-            {
-                Sub(y, yOff, x, xOff, z, zOff);
-            }
-            return pos;
-        }
-
-        public static bool Eq(uint[] x, uint[] y)
-        {
-            for (int i = 6; i >= 0; --i)
-            {
-                if (x[i] != y[i])
-                    return false;
-            }
-            return true;
-        }
-
-        public static uint[] FromBigInteger(BigInteger x)
-        {
-            if (x.SignValue < 0 || x.BitLength > 224)
-                throw new ArgumentException();
-
-            uint[] z = Create();
-            int i = 0;
-            while (x.SignValue != 0)
-            {
-                z[i++] = (uint)x.IntValue;
-                x = x.ShiftRight(32);
-            }
-            return z;
-        }
-
-        public static uint GetBit(uint[] x, int bit)
-        {
-            if (bit == 0)
-            {
-                return x[0] & 1;
-            }
-            int w = bit >> 5;
-            if (w < 0 || w >= 7)
-            {
-                return 0;
-            }
-            int b = bit & 31;
-            return (x[w] >> b) & 1;
-        }
-
-        public static bool Gte(uint[] x, uint[] y)
-        {
-            for (int i = 6; i >= 0; --i)
-            {
-                uint x_i = x[i], y_i = y[i];
-                if (x_i < y_i)
-                    return false;
-                if (x_i > y_i)
-                    return true;
-            }
-            return true;
-        }
-
-        public static bool Gte(uint[] x, int xOff, uint[] y, int yOff)
-        {
-            for (int i = 6; i >= 0; --i)
-            {
-                uint x_i = x[xOff + i], y_i = y[yOff + i];
-                if (x_i < y_i)
-                    return false;
-                if (x_i > y_i)
-                    return true;
-            }
-            return true;
-        }
-
-        public static bool IsOne(uint[] x)
-        {
-            if (x[0] != 1)
-            {
-                return false;
-            }
-            for (int i = 1; i < 7; ++i)
-            {
-                if (x[i] != 0)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public static bool IsZero(uint[] x)
-        {
-            for (int i = 0; i < 7; ++i)
-            {
-                if (x[i] != 0)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public static void Mul(uint[] x, uint[] y, uint[] zz)
-        {
-            ulong y_0 = y[0];
-            ulong y_1 = y[1];
-            ulong y_2 = y[2];
-            ulong y_3 = y[3];
-            ulong y_4 = y[4];
-            ulong y_5 = y[5];
-            ulong y_6 = y[6];
-
-            {
-                ulong c = 0, x_0 = x[0];
-                c += x_0 * y_0;
-                zz[0] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_1;
-                zz[1] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_2;
-                zz[2] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_3;
-                zz[3] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_4;
-                zz[4] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_5;
-                zz[5] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_6;
-                zz[6] = (uint)c;
-                c >>= 32;
-                zz[7] = (uint)c;
-            }
-
-            for (int i = 1; i < 7; ++i)
-            {
-                ulong c = 0, x_i = x[i];
-                c += x_i * y_0 + zz[i + 0];
-                zz[i + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[i + 1];
-                zz[i + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[i + 2];
-                zz[i + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[i + 3];
-                zz[i + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[i + 4];
-                zz[i + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[i + 5];
-                zz[i + 5] = (uint)c;
-                c >>= 32;
-                c += x_i * y_6 + zz[i + 6];
-                zz[i + 6] = (uint)c;
-                c >>= 32;
-                zz[i + 7] = (uint)c;
-            }
-        }
-
-        public static void Mul(uint[] x, int xOff, uint[] y, int yOff, uint[] zz, int zzOff)
-        {
-            ulong y_0 = y[yOff + 0];
-            ulong y_1 = y[yOff + 1];
-            ulong y_2 = y[yOff + 2];
-            ulong y_3 = y[yOff + 3];
-            ulong y_4 = y[yOff + 4];
-            ulong y_5 = y[yOff + 5];
-            ulong y_6 = y[yOff + 6];
-
-            {
-                ulong c = 0, x_0 = x[xOff + 0];
-                c += x_0 * y_0;
-                zz[zzOff + 0] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_1;
-                zz[zzOff + 1] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_2;
-                zz[zzOff + 2] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_3;
-                zz[zzOff + 3] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_4;
-                zz[zzOff + 4] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_5;
-                zz[zzOff + 5] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_6;
-                zz[zzOff + 6] = (uint)c;
-                c >>= 32;
-                zz[zzOff + 7] = (uint)c;
-            }
-
-            for (int i = 1; i < 7; ++i)
-            {
-                ++zzOff;
-                ulong c = 0, x_i = x[xOff + i];
-                c += x_i * y_0 + zz[zzOff + 0];
-                zz[zzOff + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[zzOff + 1];
-                zz[zzOff + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[zzOff + 2];
-                zz[zzOff + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[zzOff + 3];
-                zz[zzOff + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[zzOff + 4];
-                zz[zzOff + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[zzOff + 5];
-                zz[zzOff + 5] = (uint)c;
-                c >>= 32;
-                c += x_i * y_6 + zz[zzOff + 6];
-                zz[zzOff + 6] = (uint)c;
-                c >>= 32;
-                zz[zzOff + 7] = (uint)c;
-            }
-        }
-
-        public static uint MulAddTo(uint[] x, uint[] y, uint[] zz)
-        {
-            ulong y_0 = y[0];
-            ulong y_1 = y[1];
-            ulong y_2 = y[2];
-            ulong y_3 = y[3];
-            ulong y_4 = y[4];
-            ulong y_5 = y[5];
-            ulong y_6 = y[6];
-
-            ulong zc = 0;
-            for (int i = 0; i < 7; ++i)
-            {
-                ulong c = 0, x_i = x[i];
-                c += x_i * y_0 + zz[i + 0];
-                zz[i + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[i + 1];
-                zz[i + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[i + 2];
-                zz[i + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[i + 3];
-                zz[i + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[i + 4];
-                zz[i + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[i + 5];
-                zz[i + 5] = (uint)c;
-                c >>= 32;
-                c += x_i * y_6 + zz[i + 6];
-                zz[i + 6] = (uint)c;
-                c >>= 32;
-                c += zc + zz[i + 7];
-                zz[i + 7] = (uint)c;
-                zc = c >> 32;
-            }
-            return (uint)zc;
-        }
-
-        public static uint MulAddTo(uint[] x, int xOff, uint[] y, int yOff, uint[] zz, int zzOff)
-        {
-            ulong y_0 = y[yOff + 0];
-            ulong y_1 = y[yOff + 1];
-            ulong y_2 = y[yOff + 2];
-            ulong y_3 = y[yOff + 3];
-            ulong y_4 = y[yOff + 4];
-            ulong y_5 = y[yOff + 5];
-            ulong y_6 = y[yOff + 6];
-
-            ulong zc = 0;
-            for (int i = 0; i < 7; ++i)
-            {
-                ulong c = 0, x_i = x[xOff + i];
-                c += x_i * y_0 + zz[zzOff + 0];
-                zz[zzOff + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[zzOff + 1];
-                zz[zzOff + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[zzOff + 2];
-                zz[zzOff + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[zzOff + 3];
-                zz[zzOff + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[zzOff + 4];
-                zz[zzOff + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[zzOff + 5];
-                zz[zzOff + 5] = (uint)c;
-                c >>= 32;
-                c += x_i * y_6 + zz[zzOff + 6];
-                zz[zzOff + 6] = (uint)c;
-                c >>= 32;
-                c += zc + zz[zzOff + 7];
-                zz[zzOff + 7] = (uint)c;
-                zc = c >> 32;
-                ++zzOff;
-            }
-            return (uint)zc;
-        }
-
-        public static ulong Mul33Add(uint w, uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            Debug.Assert(w >> 31 == 0);
-
-            ulong c = 0, wVal = w;
-            ulong x0 = x[xOff + 0];
-            c += wVal * x0 + y[yOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            ulong x1 = x[xOff + 1];
-            c += wVal * x1 + x0 + y[yOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            ulong x2 = x[xOff + 2];
-            c += wVal * x2 + x1 + y[yOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            ulong x3 = x[xOff + 3];
-            c += wVal * x3 + x2 + y[yOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            ulong x4 = x[xOff + 4];
-            c += wVal * x4 + x3 + y[yOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            ulong x5 = x[xOff + 5];
-            c += wVal * x5 + x4 + y[yOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            ulong x6 = x[xOff + 6];
-            c += wVal * x6 + x5 + y[yOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            c += x6;
-            return c;
-        }
-
-        public static uint MulByWord(uint x, uint[] z)
-        {
-            ulong c = 0, xVal = x;
-            c += xVal * (ulong)z[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint MulByWordAddTo(uint x, uint[] y, uint[] z)
-        {
-            ulong c = 0, xVal = x;
-            c += xVal * (ulong)z[0] + y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[1] + y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[2] + y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[3] + y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[4] + y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[5] + y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[6] + y[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint MulWordAddTo(uint x, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            ulong c = 0, xVal = x;
-            c += xVal * y[yOff + 0] + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 1] + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 2] + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 3] + z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 4] + z[zOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 5] + z[zOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 6] + z[zOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint Mul33DWordAdd(uint x, ulong y, uint[] z, int zOff)
-        {
-            Debug.Assert(x >> 31 == 0);
-            Debug.Assert(zOff <= 3);
-            ulong c = 0, xVal = x;
-            ulong y00 = y & M;
-            c += xVal * y00 + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            ulong y01 = y >> 32;
-            c += xVal * y01 + y00 + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += y01 + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : Nat.IncAt(7, z, zOff, 4);
-        }
-
-        public static uint Mul33WordAdd(uint x, uint y, uint[] z, int zOff)
-        {
-            Debug.Assert(x >> 31 == 0);
-            Debug.Assert(zOff <= 4);
-            ulong c = 0, yVal = y;
-            c += yVal * x + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += yVal + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : Nat.IncAt(7, z, zOff, 3);
-        }
-
-        public static uint MulWordDwordAdd(uint x, ulong y, uint[] z, int zOff)
-        {
-            Debug.Assert(zOff <= 4);
-            ulong c = 0, xVal = x;
-            c += xVal * y + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += xVal * (y >> 32) + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : Nat.IncAt(7, z, zOff, 3);
-        }
-
-        public static uint MulWord(uint x, uint[] y, uint[] z, int zOff)
-        {
-            ulong c = 0, xVal = x;
-            int i = 0;
-            do
-            {
-                c += xVal * y[i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            while (++i < 7);
-            return (uint)c;
-        }
-
-        public static void Square(uint[] x, uint[] zz)
-        {
-            ulong x_0 = x[0];
-            ulong zz_1;
-
-            uint c = 0, w;
-            {
-                int i = 6, j = 14;
-                do
-                {
-                    ulong xVal = x[i--];
-                    ulong p = xVal * xVal;
-                    zz[--j] = (c << 31) | (uint)(p >> 33);
-                    zz[--j] = (uint)(p >> 1);
-                    c = (uint)p;
-                }
-                while (i > 0);
-
-                {
-                    ulong p = x_0 * x_0;
-                    zz_1 = (ulong)(c << 31) | (p >> 33);
-                    zz[0] = (uint)p;
-                    c = (uint)(p >> 32) & 1;
-                }
-            }
-
-            ulong x_1 = x[1];
-            ulong zz_2 = zz[2];
-
-            {
-                zz_1 += x_1 * x_0;
-                w = (uint)zz_1;
-                zz[1] = (w << 1) | c;
-                c = w >> 31;
-                zz_2 += zz_1 >> 32;
-            }
-
-            ulong x_2 = x[2];
-            ulong zz_3 = zz[3];
-            ulong zz_4 = zz[4];
-            {
-                zz_2 += x_2 * x_0;
-                w = (uint)zz_2;
-                zz[2] = (w << 1) | c;
-                c = w >> 31;
-                zz_3 += (zz_2 >> 32) + x_2 * x_1;
-                zz_4 += zz_3 >> 32;
-                zz_3 &= M;
-            }
-
-            ulong x_3 = x[3];
-            ulong zz_5 = zz[5];
-            ulong zz_6 = zz[6];
-            {
-                zz_3 += x_3 * x_0;
-                w = (uint)zz_3;
-                zz[3] = (w << 1) | c;
-                c = w >> 31;
-                zz_4 += (zz_3 >> 32) + x_3 * x_1;
-                zz_5 += (zz_4 >> 32) + x_3 * x_2;
-                zz_4 &= M;
-                zz_6 += zz_5 >> 32;
-                zz_5 &= M;
-            }
-
-            ulong x_4 = x[4];
-            ulong zz_7 = zz[7];
-            ulong zz_8 = zz[8];
-            {
-                zz_4 += x_4 * x_0;
-                w = (uint)zz_4;
-                zz[4] = (w << 1) | c;
-                c = w >> 31;
-                zz_5 += (zz_4 >> 32) + x_4 * x_1;
-                zz_6 += (zz_5 >> 32) + x_4 * x_2;
-                zz_5 &= M;
-                zz_7 += (zz_6 >> 32) + x_4 * x_3;
-                zz_6 &= M;
-                zz_8 += zz_7 >> 32;
-                zz_7 &= M;
-            }
-
-            ulong x_5 = x[5];
-            ulong zz_9 = zz[9];
-            ulong zz_10 = zz[10];
-            {
-                zz_5 += x_5 * x_0;
-                w = (uint)zz_5;
-                zz[5] = (w << 1) | c;
-                c = w >> 31;
-                zz_6 += (zz_5 >> 32) + x_5 * x_1;
-                zz_7 += (zz_6 >> 32) + x_5 * x_2;
-                zz_6 &= M;
-                zz_8 += (zz_7 >> 32) + x_5 * x_3;
-                zz_7 &= M;
-                zz_9 += (zz_8 >> 32) + x_5 * x_4;
-                zz_8 &= M;
-                zz_10 += zz_9 >> 32;
-                zz_9 &= M;
-            }
-
-            ulong x_6 = x[6];
-            ulong zz_11 = zz[11];
-            ulong zz_12 = zz[12];
-            {
-                zz_6 += x_6 * x_0;
-                w = (uint)zz_6;
-                zz[6] = (w << 1) | c;
-                c = w >> 31;
-                zz_7 += (zz_6 >> 32) + x_6 * x_1;
-                zz_8 += (zz_7 >> 32) + x_6 * x_2;
-                zz_9 += (zz_8 >> 32) + x_6 * x_3;
-                zz_10 += (zz_9 >> 32) + x_6 * x_4;
-                zz_11 += (zz_10 >> 32) + x_6 * x_5;
-                zz_12 += zz_11 >> 32;
-            }
-
-            w = (uint)zz_7;
-            zz[7] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_8;
-            zz[8] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_9;
-            zz[9] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_10;
-            zz[10] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_11;
-            zz[11] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_12;
-            zz[12] = (w << 1) | c;
-            c = w >> 31;
-            w = zz[13] + (uint)(zz_12 >> 32);
-            zz[13] = (w << 1) | c;
-        }
-
-        public static void Square(uint[] x, int xOff, uint[] zz, int zzOff)
-        {
-            ulong x_0 = x[xOff + 0];
-            ulong zz_1;
-
-            uint c = 0, w;
-            {
-                int i = 6, j = 14;
-                do
-                {
-                    ulong xVal = x[xOff + i--];
-                    ulong p = xVal * xVal;
-                    zz[zzOff + --j] = (c << 31) | (uint)(p >> 33);
-                    zz[zzOff + --j] = (uint)(p >> 1);
-                    c = (uint)p;
-                }
-                while (i > 0);
-
-                {
-                    ulong p = x_0 * x_0;
-                    zz_1 = (ulong)(c << 31) | (p >> 33);
-                    zz[zzOff + 0] = (uint)p;
-                    c = (uint)(p >> 32) & 1;
-                }
-            }
-
-            ulong x_1 = x[xOff + 1];
-            ulong zz_2 = zz[zzOff + 2];
-
-            {
-                zz_1 += x_1 * x_0;
-                w = (uint)zz_1;
-                zz[zzOff + 1] = (w << 1) | c;
-                c = w >> 31;
-                zz_2 += zz_1 >> 32;
-            }
-
-            ulong x_2 = x[xOff + 2];
-            ulong zz_3 = zz[zzOff + 3];
-            ulong zz_4 = zz[zzOff + 4];
-            {
-                zz_2 += x_2 * x_0;
-                w = (uint)zz_2;
-                zz[zzOff + 2] = (w << 1) | c;
-                c = w >> 31;
-                zz_3 += (zz_2 >> 32) + x_2 * x_1;
-                zz_4 += zz_3 >> 32;
-                zz_3 &= M;
-            }
-
-            ulong x_3 = x[xOff + 3];
-            ulong zz_5 = zz[zzOff + 5];
-            ulong zz_6 = zz[zzOff + 6];
-            {
-                zz_3 += x_3 * x_0;
-                w = (uint)zz_3;
-                zz[zzOff + 3] = (w << 1) | c;
-                c = w >> 31;
-                zz_4 += (zz_3 >> 32) + x_3 * x_1;
-                zz_5 += (zz_4 >> 32) + x_3 * x_2;
-                zz_4 &= M;
-                zz_6 += zz_5 >> 32;
-                zz_5 &= M;
-            }
-
-            ulong x_4 = x[xOff + 4];
-            ulong zz_7 = zz[zzOff + 7];
-            ulong zz_8 = zz[zzOff + 8];
-            {
-                zz_4 += x_4 * x_0;
-                w = (uint)zz_4;
-                zz[zzOff + 4] = (w << 1) | c;
-                c = w >> 31;
-                zz_5 += (zz_4 >> 32) + x_4 * x_1;
-                zz_6 += (zz_5 >> 32) + x_4 * x_2;
-                zz_5 &= M;
-                zz_7 += (zz_6 >> 32) + x_4 * x_3;
-                zz_6 &= M;
-                zz_8 += zz_7 >> 32;
-                zz_7 &= M;
-            }
-
-            ulong x_5 = x[xOff + 5];
-            ulong zz_9 = zz[zzOff + 9];
-            ulong zz_10 = zz[zzOff + 10];
-            {
-                zz_5 += x_5 * x_0;
-                w = (uint)zz_5;
-                zz[zzOff + 5] = (w << 1) | c;
-                c = w >> 31;
-                zz_6 += (zz_5 >> 32) + x_5 * x_1;
-                zz_7 += (zz_6 >> 32) + x_5 * x_2;
-                zz_6 &= M;
-                zz_8 += (zz_7 >> 32) + x_5 * x_3;
-                zz_7 &= M;
-                zz_9 += (zz_8 >> 32) + x_5 * x_4;
-                zz_8 &= M;
-                zz_10 += zz_9 >> 32;
-                zz_9 &= M;
-            }
-
-            ulong x_6 = x[xOff + 6];
-            ulong zz_11 = zz[zzOff + 11];
-            ulong zz_12 = zz[zzOff + 12];
-            {
-                zz_6 += x_6 * x_0;
-                w = (uint)zz_6;
-                zz[zzOff + 6] = (w << 1) | c;
-                c = w >> 31;
-                zz_7 += (zz_6 >> 32) + x_6 * x_1;
-                zz_8 += (zz_7 >> 32) + x_6 * x_2;
-                zz_9 += (zz_8 >> 32) + x_6 * x_3;
-                zz_10 += (zz_9 >> 32) + x_6 * x_4;
-                zz_11 += (zz_10 >> 32) + x_6 * x_5;
-                zz_12 += zz_11 >> 32;
-            }
-
-            w = (uint)zz_7;
-            zz[zzOff + 7] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_8;
-            zz[zzOff + 8] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_9;
-            zz[zzOff + 9] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_10;
-            zz[zzOff + 10] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_11;
-            zz[zzOff + 11] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_12;
-            zz[zzOff + 12] = (w << 1) | c;
-            c = w >> 31;
-            w = zz[zzOff + 13] + (uint)(zz_12 >> 32);
-            zz[zzOff + 13] = (w << 1) | c;
-        }
-
-        public static int Sub(uint[] x, uint[] y, uint[] z)
-        {
-            long c = 0;
-            c += (long)x[0] - y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)x[1] - y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (long)x[2] - y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (long)x[3] - y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (long)x[4] - y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (long)x[5] - y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (long)x[6] - y[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int Sub(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            long c = 0;
-            c += (long)x[xOff + 0] - y[yOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 1] - y[yOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 2] - y[yOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 3] - y[yOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 4] - y[yOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 5] - y[yOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 6] - y[yOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int SubBothFrom(uint[] x, uint[] y, uint[] z)
-        {
-            long c = 0;
-            c += (long)z[0] - x[0] - y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)z[1] - x[1] - y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (long)z[2] - x[2] - y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (long)z[3] - x[3] - y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (long)z[4] - x[4] - y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (long)z[5] - x[5] - y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (long)z[6] - x[6] - y[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int SubFrom(uint[] x, uint[] z)
-        {
-            long c = 0;
-            c += (long)z[0] - x[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)z[1] - x[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (long)z[2] - x[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (long)z[3] - x[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (long)z[4] - x[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (long)z[5] - x[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (long)z[6] - x[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int SubFrom(uint[] x, int xOff, uint[] z, int zOff)
-        {
-            long c = 0;
-            c += (long)z[zOff + 0] - x[xOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 1] - x[xOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 2] - x[xOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 3] - x[xOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 4] - x[xOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 5] - x[xOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 6] - x[xOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static BigInteger ToBigInteger(uint[] x)
-        {
-            byte[] bs = new byte[28];
-            for (int i = 0; i < 7; ++i)
-            {
-                uint x_i = x[i];
-                if (x_i != 0)
-                {
-                    Pack.UInt32_To_BE(x_i, bs, (6 - i) << 2);
-                }
-            }
-            return new BigInteger(1, bs);
-        }
-
-        public static void Zero(uint[] z)
-        {
-            z[0] = 0;
-            z[1] = 0;
-            z[2] = 0;
-            z[3] = 0;
-            z[4] = 0;
-            z[5] = 0;
-            z[6] = 0;
-        }
-    }
-}
diff --git a/crypto/src/math/ec/custom/sec/Nat256.cs b/crypto/src/math/ec/custom/sec/Nat256.cs
deleted file mode 100644

index bd2d6da47..000000000
--- a/crypto/src/math/ec/custom/sec/Nat256.cs
+++ /dev/null
@@ -1,1300 +0,0 @@
-using System;
-using System.Diagnostics;
-
-using Org.BouncyCastle.Crypto.Utilities;
-
-namespace Org.BouncyCastle.Math.EC.Custom.Sec
-{
-    internal abstract class Nat256
-    {
-        private const ulong M = 0xFFFFFFFFUL;
-
-        public static uint Add(uint[] x, uint[] y, uint[] z)
-        {
-            ulong c = 0;
-            c += (ulong)x[0] + y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[1] + y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[2] + y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[3] + y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[4] + y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[5] + y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[6] + y[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[7] + y[7];
-            z[7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint Add(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            ulong c = 0;
-            c += (ulong)x[xOff + 0] + y[yOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 1] + y[yOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 2] + y[yOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 3] + y[yOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 4] + y[yOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 5] + y[yOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 6] + y[yOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 7] + y[yOff + 7];
-            z[zOff + 7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddBothTo(uint[] x, uint[] y, uint[] z)
-        {
-            ulong c = 0;
-            c += (ulong)x[0] + y[0] + z[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[1] + y[1] + z[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[2] + y[2] + z[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[3] + y[3] + z[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[4] + y[4] + z[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[5] + y[5] + z[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[6] + y[6] + z[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[7] + y[7] + z[7];
-            z[7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddBothTo(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            ulong c = 0;
-            c += (ulong)x[xOff + 0] + y[yOff + 0] + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 1] + y[yOff + 1] + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 2] + y[yOff + 2] + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 3] + y[yOff + 3] + z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 4] + y[yOff + 4] + z[zOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 5] + y[yOff + 5] + z[zOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 6] + y[yOff + 6] + z[zOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 7] + y[yOff + 7] + z[zOff + 7];
-            z[zOff + 7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddTo(uint[] x, uint[] z)
-        {
-            ulong c = 0;
-            c += (ulong)x[0] + z[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[1] + z[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[2] + z[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[3] + z[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[4] + z[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[5] + z[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[6] + z[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[7] + z[7];
-            z[7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddTo(uint[] x, int xOff, uint[] z, int zOff, uint cIn)
-        {
-            ulong c = cIn;
-            c += (ulong)x[xOff + 0] + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 1] + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 2] + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 3] + z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 4] + z[zOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 5] + z[zOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 6] + z[zOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            c += (ulong)x[xOff + 7] + z[zOff + 7];
-            z[zOff + 7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint AddToEachOther(uint[] u, int uOff, uint[] v, int vOff)
-        {
-            ulong c = 0;
-            c += (ulong)u[uOff + 0] + v[vOff + 0];
-            u[uOff + 0] = (uint)c;
-            v[vOff + 0] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 1] + v[vOff + 1];
-            u[uOff + 1] = (uint)c;
-            v[vOff + 1] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 2] + v[vOff + 2];
-            u[uOff + 2] = (uint)c;
-            v[vOff + 2] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 3] + v[vOff + 3];
-            u[uOff + 3] = (uint)c;
-            v[vOff + 3] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 4] + v[vOff + 4];
-            u[uOff + 4] = (uint)c;
-            v[vOff + 4] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 5] + v[vOff + 5];
-            u[uOff + 5] = (uint)c;
-            v[vOff + 5] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 6] + v[vOff + 6];
-            u[uOff + 6] = (uint)c;
-            v[vOff + 6] = (uint)c;
-            c >>= 32;
-            c += (ulong)u[uOff + 7] + v[vOff + 7];
-            u[uOff + 7] = (uint)c;
-            v[vOff + 7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static void Copy(uint[] x, uint[] 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];
-            z[7] = x[7];
-        }
-
-        public static uint[] Create()
-        {
-            return new uint[8];
-        }
-
-        public static uint[] CreateExt()
-        {
-            return new uint[16];
-        }
-
-        public static bool Diff(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            bool pos = Gte(x, xOff, y, yOff);
-            if (pos)
-            {
-                Sub(x, xOff, y, yOff, z, zOff);
-            }
-            else
-            {
-                Sub(y, yOff, x, xOff, z, zOff);
-            }
-            return pos;
-        }
-
-        public static bool Eq(uint[] x, uint[] y)
-        {
-            for (int i = 7; i >= 0; --i)
-            {
-                if (x[i] != y[i])
-                    return false;
-            }
-            return true;
-        }
-
-        public static uint[] FromBigInteger(BigInteger x)
-        {
-            if (x.SignValue < 0 || x.BitLength > 256)
-                throw new ArgumentException();
-
-            uint[] z = Create();
-            int i = 0;
-            while (x.SignValue != 0)
-            {
-                z[i++] = (uint)x.IntValue;
-                x = x.ShiftRight(32);
-            }
-            return z;
-        }
-
-        public static uint GetBit(uint[] x, int bit)
-        {
-            if (bit == 0)
-            {
-                return x[0] & 1;
-            }
-            if ((bit & 255) != bit)
-            {
-                return 0;
-            }
-            int w = bit >> 5;
-            int b = bit & 31;
-            return (x[w] >> b) & 1;
-        }
-
-        public static bool Gte(uint[] x, uint[] y)
-        {
-            for (int i = 7; i >= 0; --i)
-            {
-                uint x_i = x[i], y_i = y[i];
-                if (x_i < y_i)
-                    return false;
-                if (x_i > y_i)
-                    return true;
-            }
-            return true;
-        }
-
-        public static bool Gte(uint[] x, int xOff, uint[] y, int yOff)
-        {
-            for (int i = 7; i >= 0; --i)
-            {
-                uint x_i = x[xOff + i], y_i = y[yOff + i];
-                if (x_i < y_i)
-                    return false;
-                if (x_i > y_i)
-                    return true;
-            }
-            return true;
-        }
-
-        public static bool IsOne(uint[] x)
-        {
-            if (x[0] != 1)
-            {
-                return false;
-            }
-            for (int i = 1; i < 8; ++i)
-            {
-                if (x[i] != 0)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public static bool IsZero(uint[] x)
-        {
-            for (int i = 0; i < 8; ++i)
-            {
-                if (x[i] != 0)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public static void Mul(uint[] x, uint[] y, uint[] zz)
-        {
-            ulong y_0 = y[0];
-            ulong y_1 = y[1];
-            ulong y_2 = y[2];
-            ulong y_3 = y[3];
-            ulong y_4 = y[4];
-            ulong y_5 = y[5];
-            ulong y_6 = y[6];
-            ulong y_7 = y[7];
-
-            {
-                ulong c = 0, x_0 = x[0];
-                c += x_0 * y_0;
-                zz[0] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_1;
-                zz[1] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_2;
-                zz[2] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_3;
-                zz[3] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_4;
-                zz[4] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_5;
-                zz[5] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_6;
-                zz[6] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_7;
-                zz[7] = (uint)c;
-                c >>= 32;
-                zz[8] = (uint)c;
-            }
-
-            for (int i = 1; i < 8; ++i)
-            {
-                ulong c = 0, x_i = x[i];
-                c += x_i * y_0 + zz[i + 0];
-                zz[i + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[i + 1];
-                zz[i + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[i + 2];
-                zz[i + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[i + 3];
-                zz[i + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[i + 4];
-                zz[i + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[i + 5];
-                zz[i + 5] = (uint)c;
-                c >>= 32;
-                c += x_i * y_6 + zz[i + 6];
-                zz[i + 6] = (uint)c;
-                c >>= 32;
-                c += x_i * y_7 + zz[i + 7];
-                zz[i + 7] = (uint)c;
-                c >>= 32;
-                zz[i + 8] = (uint)c;
-            }
-        }
-
-        public static void Mul(uint[] x, int xOff, uint[] y, int yOff, uint[] zz, int zzOff)
-        {
-            ulong y_0 = y[yOff + 0];
-            ulong y_1 = y[yOff + 1];
-            ulong y_2 = y[yOff + 2];
-            ulong y_3 = y[yOff + 3];
-            ulong y_4 = y[yOff + 4];
-            ulong y_5 = y[yOff + 5];
-            ulong y_6 = y[yOff + 6];
-            ulong y_7 = y[yOff + 7];
-
-            {
-                ulong c = 0, x_0 = x[xOff + 0];
-                c += x_0 * y_0;
-                zz[zzOff + 0] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_1;
-                zz[zzOff + 1] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_2;
-                zz[zzOff + 2] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_3;
-                zz[zzOff + 3] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_4;
-                zz[zzOff + 4] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_5;
-                zz[zzOff + 5] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_6;
-                zz[zzOff + 6] = (uint)c;
-                c >>= 32;
-                c += x_0 * y_7;
-                zz[zzOff + 7] = (uint)c;
-                c >>= 32;
-                zz[zzOff + 8] = (uint)c;
-            }
-
-            for (int i = 1; i < 8; ++i)
-            {
-                ++zzOff;
-                ulong c = 0, x_i = x[xOff + i];
-                c += x_i * y_0 + zz[zzOff + 0];
-                zz[zzOff + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[zzOff + 1];
-                zz[zzOff + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[zzOff + 2];
-                zz[zzOff + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[zzOff + 3];
-                zz[zzOff + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[zzOff + 4];
-                zz[zzOff + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[zzOff + 5];
-                zz[zzOff + 5] = (uint)c;
-                c >>= 32;
-                c += x_i * y_6 + zz[zzOff + 6];
-                zz[zzOff + 6] = (uint)c;
-                c >>= 32;
-                c += x_i * y_7 + zz[zzOff + 7];
-                zz[zzOff + 7] = (uint)c;
-                c >>= 32;
-                zz[zzOff + 8] = (uint)c;
-            }
-        }
-
-        public static uint MulAddTo(uint[] x, uint[] y, uint[] zz)
-        {
-            ulong y_0 = y[0];
-            ulong y_1 = y[1];
-            ulong y_2 = y[2];
-            ulong y_3 = y[3];
-            ulong y_4 = y[4];
-            ulong y_5 = y[5];
-            ulong y_6 = y[6];
-            ulong y_7 = y[7];
-
-            ulong zc = 0;
-            for (int i = 0; i < 8; ++i)
-            {
-                ulong c = 0, x_i = x[i];
-                c += x_i * y_0 + zz[i + 0];
-                zz[i + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[i + 1];
-                zz[i + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[i + 2];
-                zz[i + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[i + 3];
-                zz[i + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[i + 4];
-                zz[i + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[i + 5];
-                zz[i + 5] = (uint)c;
-                c >>= 32;
-                c += x_i * y_6 + zz[i + 6];
-                zz[i + 6] = (uint)c;
-                c >>= 32;
-                c += x_i * y_7 + zz[i + 7];
-                zz[i + 7] = (uint)c;
-                c >>= 32;
-                c += zc + zz[i + 8];
-                zz[i + 8] = (uint)c;
-                zc = c >> 32;
-            }
-            return (uint)zc;
-        }
-
-        public static uint MulAddTo(uint[] x, int xOff, uint[] y, int yOff, uint[] zz, int zzOff)
-        {
-            ulong y_0 = y[yOff + 0];
-            ulong y_1 = y[yOff + 1];
-            ulong y_2 = y[yOff + 2];
-            ulong y_3 = y[yOff + 3];
-            ulong y_4 = y[yOff + 4];
-            ulong y_5 = y[yOff + 5];
-            ulong y_6 = y[yOff + 6];
-            ulong y_7 = y[yOff + 7];
-
-            ulong zc = 0;
-            for (int i = 0; i < 8; ++i)
-            {
-                ulong c = 0, x_i = x[xOff + i];
-                c += x_i * y_0 + zz[zzOff + 0];
-                zz[zzOff + 0] = (uint)c;
-                c >>= 32;
-                c += x_i * y_1 + zz[zzOff + 1];
-                zz[zzOff + 1] = (uint)c;
-                c >>= 32;
-                c += x_i * y_2 + zz[zzOff + 2];
-                zz[zzOff + 2] = (uint)c;
-                c >>= 32;
-                c += x_i * y_3 + zz[zzOff + 3];
-                zz[zzOff + 3] = (uint)c;
-                c >>= 32;
-                c += x_i * y_4 + zz[zzOff + 4];
-                zz[zzOff + 4] = (uint)c;
-                c >>= 32;
-                c += x_i * y_5 + zz[zzOff + 5];
-                zz[zzOff + 5] = (uint)c;
-                c >>= 32;
-                c += x_i * y_6 + zz[zzOff + 6];
-                zz[zzOff + 6] = (uint)c;
-                c >>= 32;
-                c += x_i * y_7 + zz[zzOff + 7];
-                zz[zzOff + 7] = (uint)c;
-                c >>= 32;
-                c += zc + zz[zzOff + 8];
-                zz[zzOff + 8] = (uint)c;
-                zc = c >> 32;
-                ++zzOff;
-            }
-            return (uint)zc;
-        }
-
-        public static ulong Mul33Add(uint w, uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            Debug.Assert(w >> 31 == 0);
-
-            ulong c = 0, wVal = w;
-            ulong x0 = x[xOff + 0];
-            c += wVal * x0 + y[yOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            ulong x1 = x[xOff + 1];
-            c += wVal * x1 + x0 + y[yOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            ulong x2 = x[xOff + 2];
-            c += wVal * x2 + x1 + y[yOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            ulong x3 = x[xOff + 3];
-            c += wVal * x3 + x2 + y[yOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            ulong x4 = x[xOff + 4];
-            c += wVal * x4 + x3 + y[yOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            ulong x5 = x[xOff + 5];
-            c += wVal * x5 + x4 + y[yOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            ulong x6 = x[xOff + 6];
-            c += wVal * x6 + x5 + y[yOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            ulong x7 = x[xOff + 7];
-            c += wVal * x7 + x6 + y[yOff + 7];
-            z[zOff + 7] = (uint)c;
-            c >>= 32;
-            c += x7;
-            return c;
-        }
-
-        public static uint MulByWord(uint x, uint[] z)
-        {
-            ulong c = 0, xVal = x;
-            c += xVal * (ulong)z[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[7];
-            z[7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint MulByWordAddTo(uint x, uint[] y, uint[] z)
-        {
-            ulong c = 0, xVal = x;
-            c += xVal * (ulong)z[0] + y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[1] + y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[2] + y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[3] + y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[4] + y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[5] + y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[6] + y[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            c += xVal * (ulong)z[7] + y[7];
-            z[7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint MulWordAddTo(uint x, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            ulong c = 0, xVal = x;
-            c += xVal * y[yOff + 0] + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 1] + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 2] + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 3] + z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 4] + z[zOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 5] + z[zOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 6] + z[zOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            c += xVal * y[yOff + 7] + z[zOff + 7];
-            z[zOff + 7] = (uint)c;
-            c >>= 32;
-            return (uint)c;
-        }
-
-        public static uint Mul33DWordAdd(uint x, ulong y, uint[] z, int zOff)
-        {
-            Debug.Assert(x >> 31 == 0);
-            Debug.Assert(zOff <= 4);
-            ulong c = 0, xVal = x;
-            ulong y00 = y & M;
-            c += xVal * y00 + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            ulong y01 = y >> 32;
-            c += xVal * y01 + y00 + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += y01 + z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += z[zOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : Nat.IncAt(8, z, zOff, 4);
-        }
-
-        public static uint Mul33WordAdd(uint x, uint y, uint[] z, int zOff)
-        {
-            Debug.Assert(x >> 31 == 0);
-            Debug.Assert(zOff <= 5);
-            ulong c = 0, yVal = y;
-            c += yVal * x + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += yVal + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : Nat.IncAt(8, z, zOff, 3);
-        }
-
-        public static uint MulWordDwordAdd(uint x, ulong y, uint[] z, int zOff)
-        {
-            Debug.Assert(zOff <= 5);
-            ulong c = 0, xVal = x;
-            c += xVal * y + z[zOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += xVal * (y >> 32) + z[zOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += z[zOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            return c == 0 ? 0 : Nat.IncAt(8, z, zOff, 3);
-        }
-
-        public static uint MulWord(uint x, uint[] y, uint[] z, int zOff)
-        {
-            ulong c = 0, xVal = x;
-            int i = 0;
-            do
-            {
-                c += xVal * y[i];
-                z[zOff + i] = (uint)c;
-                c >>= 32;
-            }
-            while (++i < 8);
-            return (uint)c;
-        }
-
-        public static void Square(uint[] x, uint[] zz)
-        {
-            ulong x_0 = x[0];
-            ulong zz_1;
-
-            uint c = 0, w;
-            {
-                int i = 7, j = 16;
-                do
-                {
-                    ulong xVal = x[i--];
-                    ulong p = xVal * xVal;
-                    zz[--j] = (c << 31) | (uint)(p >> 33);
-                    zz[--j] = (uint)(p >> 1);
-                    c = (uint)p;
-                }
-                while (i > 0);
-
-                {
-                    ulong p = x_0 * x_0;
-                    zz_1 = (ulong)(c << 31) | (p >> 33);
-                    zz[0] = (uint)p;
-                    c = (uint)(p >> 32) & 1;
-                }
-            }
-
-            ulong x_1 = x[1];
-            ulong zz_2 = zz[2];
-
-            {
-                zz_1 += x_1 * x_0;
-                w = (uint)zz_1;
-                zz[1] = (w << 1) | c;
-                c = w >> 31;
-                zz_2 += zz_1 >> 32;
-            }
-
-            ulong x_2 = x[2];
-            ulong zz_3 = zz[3];
-            ulong zz_4 = zz[4];
-            {
-                zz_2 += x_2 * x_0;
-                w = (uint)zz_2;
-                zz[2] = (w << 1) | c;
-                c = w >> 31;
-                zz_3 += (zz_2 >> 32) + x_2 * x_1;
-                zz_4 += zz_3 >> 32;
-                zz_3 &= M;
-            }
-
-            ulong x_3 = x[3];
-            ulong zz_5 = zz[5];
-            ulong zz_6 = zz[6];
-            {
-                zz_3 += x_3 * x_0;
-                w = (uint)zz_3;
-                zz[3] = (w << 1) | c;
-                c = w >> 31;
-                zz_4 += (zz_3 >> 32) + x_3 * x_1;
-                zz_5 += (zz_4 >> 32) + x_3 * x_2;
-                zz_4 &= M;
-                zz_6 += zz_5 >> 32;
-                zz_5 &= M;
-            }
-
-            ulong x_4 = x[4];
-            ulong zz_7 = zz[7];
-            ulong zz_8 = zz[8];
-            {
-                zz_4 += x_4 * x_0;
-                w = (uint)zz_4;
-                zz[4] = (w << 1) | c;
-                c = w >> 31;
-                zz_5 += (zz_4 >> 32) + x_4 * x_1;
-                zz_6 += (zz_5 >> 32) + x_4 * x_2;
-                zz_5 &= M;
-                zz_7 += (zz_6 >> 32) + x_4 * x_3;
-                zz_6 &= M;
-                zz_8 += zz_7 >> 32;
-                zz_7 &= M;
-            }
-
-            ulong x_5 = x[5];
-            ulong zz_9 = zz[9];
-            ulong zz_10 = zz[10];
-            {
-                zz_5 += x_5 * x_0;
-                w = (uint)zz_5;
-                zz[5] = (w << 1) | c;
-                c = w >> 31;
-                zz_6 += (zz_5 >> 32) + x_5 * x_1;
-                zz_7 += (zz_6 >> 32) + x_5 * x_2;
-                zz_6 &= M;
-                zz_8 += (zz_7 >> 32) + x_5 * x_3;
-                zz_7 &= M;
-                zz_9 += (zz_8 >> 32) + x_5 * x_4;
-                zz_8 &= M;
-                zz_10 += zz_9 >> 32;
-                zz_9 &= M;
-            }
-
-            ulong x_6 = x[6];
-            ulong zz_11 = zz[11];
-            ulong zz_12 = zz[12];
-            {
-                zz_6 += x_6 * x_0;
-                w = (uint)zz_6;
-                zz[6] = (w << 1) | c;
-                c = w >> 31;
-                zz_7 += (zz_6 >> 32) + x_6 * x_1;
-                zz_8 += (zz_7 >> 32) + x_6 * x_2;
-                zz_7 &= M;
-                zz_9 += (zz_8 >> 32) + x_6 * x_3;
-                zz_8 &= M;
-                zz_10 += (zz_9 >> 32) + x_6 * x_4;
-                zz_9 &= M;
-                zz_11 += (zz_10 >> 32) + x_6 * x_5;
-                zz_10 &= M;
-                zz_12 += zz_11 >> 32;
-                zz_11 &= M;
-            }
-
-            ulong x_7 = x[7];
-            ulong zz_13 = zz[13];
-            ulong zz_14 = zz[14];
-            {
-                zz_7 += x_7 * x_0;
-                w = (uint)zz_7;
-                zz[7] = (w << 1) | c;
-                c = w >> 31;
-                zz_8 += (zz_7 >> 32) + x_7 * x_1;
-                zz_9 += (zz_8 >> 32) + x_7 * x_2;
-                zz_10 += (zz_9 >> 32) + x_7 * x_3;
-                zz_11 += (zz_10 >> 32) + x_7 * x_4;
-                zz_12 += (zz_11 >> 32) + x_7 * x_5;
-                zz_13 += (zz_12 >> 32) + x_7 * x_6;
-                zz_14 += zz_13 >> 32;
-            }
-
-            w = (uint)zz_8;
-            zz[8] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_9;
-            zz[9] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_10;
-            zz[10] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_11;
-            zz[11] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_12;
-            zz[12] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_13;
-            zz[13] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_14;
-            zz[14] = (w << 1) | c;
-            c = w >> 31;
-            w = zz[15] + (uint)(zz_14 >> 32);
-            zz[15] = (w << 1) | c;
-        }
-
-        public static void Square(uint[] x, int xOff, uint[] zz, int zzOff)
-        {
-            ulong x_0 = x[xOff + 0];
-            ulong zz_1;
-
-            uint c = 0, w;
-            {
-                int i = 7, j = 16;
-                do
-                {
-                    ulong xVal = x[xOff + i--];
-                    ulong p = xVal * xVal;
-                    zz[zzOff + --j] = (c << 31) | (uint)(p >> 33);
-                    zz[zzOff + --j] = (uint)(p >> 1);
-                    c = (uint)p;
-                }
-                while (i > 0);
-
-                {
-                    ulong p = x_0 * x_0;
-                    zz_1 = (ulong)(c << 31) | (p >> 33);
-                    zz[zzOff + 0] = (uint)p;
-                    c = (uint)(p >> 32) & 1;
-                }
-            }
-
-            ulong x_1 = x[xOff + 1];
-            ulong zz_2 = zz[zzOff + 2];
-
-            {
-                zz_1 += x_1 * x_0;
-                w = (uint)zz_1;
-                zz[zzOff + 1] = (w << 1) | c;
-                c = w >> 31;
-                zz_2 += zz_1 >> 32;
-            }
-
-            ulong x_2 = x[xOff + 2];
-            ulong zz_3 = zz[zzOff + 3];
-            ulong zz_4 = zz[zzOff + 4];
-            {
-                zz_2 += x_2 * x_0;
-                w = (uint)zz_2;
-                zz[zzOff + 2] = (w << 1) | c;
-                c = w >> 31;
-                zz_3 += (zz_2 >> 32) + x_2 * x_1;
-                zz_4 += zz_3 >> 32;
-                zz_3 &= M;
-            }
-
-            ulong x_3 = x[xOff + 3];
-            ulong zz_5 = zz[zzOff + 5];
-            ulong zz_6 = zz[zzOff + 6];
-            {
-                zz_3 += x_3 * x_0;
-                w = (uint)zz_3;
-                zz[zzOff + 3] = (w << 1) | c;
-                c = w >> 31;
-                zz_4 += (zz_3 >> 32) + x_3 * x_1;
-                zz_5 += (zz_4 >> 32) + x_3 * x_2;
-                zz_4 &= M;
-                zz_6 += zz_5 >> 32;
-                zz_5 &= M;
-            }
-
-            ulong x_4 = x[xOff + 4];
-            ulong zz_7 = zz[zzOff + 7];
-            ulong zz_8 = zz[zzOff + 8];
-            {
-                zz_4 += x_4 * x_0;
-                w = (uint)zz_4;
-                zz[zzOff + 4] = (w << 1) | c;
-                c = w >> 31;
-                zz_5 += (zz_4 >> 32) + x_4 * x_1;
-                zz_6 += (zz_5 >> 32) + x_4 * x_2;
-                zz_5 &= M;
-                zz_7 += (zz_6 >> 32) + x_4 * x_3;
-                zz_6 &= M;
-                zz_8 += zz_7 >> 32;
-                zz_7 &= M;
-            }
-
-            ulong x_5 = x[xOff + 5];
-            ulong zz_9 = zz[zzOff + 9];
-            ulong zz_10 = zz[zzOff + 10];
-            {
-                zz_5 += x_5 * x_0;
-                w = (uint)zz_5;
-                zz[zzOff + 5] = (w << 1) | c;
-                c = w >> 31;
-                zz_6 += (zz_5 >> 32) + x_5 * x_1;
-                zz_7 += (zz_6 >> 32) + x_5 * x_2;
-                zz_6 &= M;
-                zz_8 += (zz_7 >> 32) + x_5 * x_3;
-                zz_7 &= M;
-                zz_9 += (zz_8 >> 32) + x_5 * x_4;
-                zz_8 &= M;
-                zz_10 += zz_9 >> 32;
-                zz_9 &= M;
-            }
-
-            ulong x_6 = x[xOff + 6];
-            ulong zz_11 = zz[zzOff + 11];
-            ulong zz_12 = zz[zzOff + 12];
-            {
-                zz_6 += x_6 * x_0;
-                w = (uint)zz_6;
-                zz[zzOff + 6] = (w << 1) | c;
-                c = w >> 31;
-                zz_7 += (zz_6 >> 32) + x_6 * x_1;
-                zz_8 += (zz_7 >> 32) + x_6 * x_2;
-                zz_7 &= M;
-                zz_9 += (zz_8 >> 32) + x_6 * x_3;
-                zz_8 &= M;
-                zz_10 += (zz_9 >> 32) + x_6 * x_4;
-                zz_9 &= M;
-                zz_11 += (zz_10 >> 32) + x_6 * x_5;
-                zz_10 &= M;
-                zz_12 += zz_11 >> 32;
-                zz_11 &= M;
-            }
-
-            ulong x_7 = x[xOff + 7];
-            ulong zz_13 = zz[zzOff + 13];
-            ulong zz_14 = zz[zzOff + 14];
-            {
-                zz_7 += x_7 * x_0;
-                w = (uint)zz_7;
-                zz[zzOff + 7] = (w << 1) | c;
-                c = w >> 31;
-                zz_8 += (zz_7 >> 32) + x_7 * x_1;
-                zz_9 += (zz_8 >> 32) + x_7 * x_2;
-                zz_10 += (zz_9 >> 32) + x_7 * x_3;
-                zz_11 += (zz_10 >> 32) + x_7 * x_4;
-                zz_12 += (zz_11 >> 32) + x_7 * x_5;
-                zz_13 += (zz_12 >> 32) + x_7 * x_6;
-                zz_14 += zz_13 >> 32;
-            }
-
-            w = (uint)zz_8;
-            zz[zzOff + 8] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_9;
-            zz[zzOff + 9] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_10;
-            zz[zzOff + 10] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_11;
-            zz[zzOff + 11] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_12;
-            zz[zzOff + 12] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_13;
-            zz[zzOff + 13] = (w << 1) | c;
-            c = w >> 31;
-            w = (uint)zz_14;
-            zz[zzOff + 14] = (w << 1) | c;
-            c = w >> 31;
-            w = zz[zzOff + 15] + (uint)(zz_14 >> 32);
-            zz[zzOff + 15] = (w << 1) | c;
-        }
-
-        public static int Sub(uint[] x, uint[] y, uint[] z)
-        {
-            long c = 0;
-            c += (long)x[0] - y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)x[1] - y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (long)x[2] - y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (long)x[3] - y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (long)x[4] - y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (long)x[5] - y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (long)x[6] - y[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            c += (long)x[7] - y[7];
-            z[7] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int Sub(uint[] x, int xOff, uint[] y, int yOff, uint[] z, int zOff)
-        {
-            long c = 0;
-            c += (long)x[xOff + 0] - y[yOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 1] - y[yOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 2] - y[yOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 3] - y[yOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 4] - y[yOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 5] - y[yOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 6] - y[yOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            c += (long)x[xOff + 7] - y[yOff + 7];
-            z[zOff + 7] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int SubBothFrom(uint[] x, uint[] y, uint[] z)
-        {
-            long c = 0;
-            c += (long)z[0] - x[0] - y[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)z[1] - x[1] - y[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (long)z[2] - x[2] - y[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (long)z[3] - x[3] - y[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (long)z[4] - x[4] - y[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (long)z[5] - x[5] - y[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (long)z[6] - x[6] - y[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            c += (long)z[7] - x[7] - y[7];
-            z[7] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int SubFrom(uint[] x, uint[] z)
-        {
-            long c = 0;
-            c += (long)z[0] - x[0];
-            z[0] = (uint)c;
-            c >>= 32;
-            c += (long)z[1] - x[1];
-            z[1] = (uint)c;
-            c >>= 32;
-            c += (long)z[2] - x[2];
-            z[2] = (uint)c;
-            c >>= 32;
-            c += (long)z[3] - x[3];
-            z[3] = (uint)c;
-            c >>= 32;
-            c += (long)z[4] - x[4];
-            z[4] = (uint)c;
-            c >>= 32;
-            c += (long)z[5] - x[5];
-            z[5] = (uint)c;
-            c >>= 32;
-            c += (long)z[6] - x[6];
-            z[6] = (uint)c;
-            c >>= 32;
-            c += (long)z[7] - x[7];
-            z[7] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static int SubFrom(uint[] x, int xOff, uint[] z, int zOff)
-        {
-            long c = 0;
-            c += (long)z[zOff + 0] - x[xOff + 0];
-            z[zOff + 0] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 1] - x[xOff + 1];
-            z[zOff + 1] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 2] - x[xOff + 2];
-            z[zOff + 2] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 3] - x[xOff + 3];
-            z[zOff + 3] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 4] - x[xOff + 4];
-            z[zOff + 4] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 5] - x[xOff + 5];
-            z[zOff + 5] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 6] - x[xOff + 6];
-            z[zOff + 6] = (uint)c;
-            c >>= 32;
-            c += (long)z[zOff + 7] - x[xOff + 7];
-            z[zOff + 7] = (uint)c;
-            c >>= 32;
-            return (int)c;
-        }
-
-        public static BigInteger ToBigInteger(uint[] x)
-        {
-            byte[] bs = new byte[32];
-            for (int i = 0; i < 8; ++i)
-            {
-                uint x_i = x[i];
-                if (x_i != 0)
-                {
-                    Pack.UInt32_To_BE(x_i, bs, (7 - i) << 2);
-                }
-            }
-            return new BigInteger(1, bs);
-        }
-
-        public static void Zero(uint[] z)
-        {
-            z[0] = 0;
-            z[1] = 0;
-            z[2] = 0;
-            z[3] = 0;
-            z[4] = 0;
-            z[5] = 0;
-            z[6] = 0;
-            z[7] = 0;
-        }
-    }
-}
diff --git a/crypto/src/math/ec/custom/sec/Nat384.cs b/crypto/src/math/ec/custom/sec/Nat384.cs
deleted file mode 100644

index dd93e68b6..000000000
--- a/crypto/src/math/ec/custom/sec/Nat384.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Diagnostics;
-
-namespace Org.BouncyCastle.Math.EC.Custom.Sec
-{
-    internal abstract class Nat384
-    {
-        public static void Mul(uint[] x, uint[] y, uint[] zz)
-        {
-            Nat192.Mul(x, y, zz);
-            Nat192.Mul(x, 6, y, 6, zz, 12);
-
-            uint c18 = Nat192.AddToEachOther(zz, 6, zz, 12);
-            uint c12 = c18 + Nat192.AddTo(zz, 0, zz, 6, 0);
-            c18 += Nat192.AddTo(zz, 18, zz, 12, c12);
-
-            uint[] dx = Nat192.Create(), dy = Nat192.Create();
-            bool neg = Nat192.Diff(x, 6, x, 0, dx, 0) != Nat192.Diff(y, 6, y, 0, dy, 0);
-
-            uint[] tt = Nat192.CreateExt();
-            Nat192.Mul(dx, dy, tt);
-
-            c18 += neg ? Nat.AddTo(12, tt, 0, zz, 6) : (uint)Nat.SubFrom(12, tt, 0, zz, 6);
-            Nat.AddWordAt(24, c18, zz, 18);
-        }
-
-        public static void Square(uint[] x, uint[] zz)
-        {
-            Nat192.Square(x, zz);
-            Nat192.Square(x, 6, zz, 12);
-
-            uint c18 = Nat192.AddToEachOther(zz, 6, zz, 12);
-            uint c12 = c18 + Nat192.AddTo(zz, 0, zz, 6, 0);
-            c18 += Nat192.AddTo(zz, 18, zz, 12, c12);
-
-            uint[] dx = Nat192.Create();
-            Nat192.Diff(x, 6, x, 0, dx, 0);
-
-            uint[] m = Nat192.CreateExt();
-            Nat192.Square(dx, m);
-
-            c18 += (uint)Nat.SubFrom(12, m, 0, zz, 6);
-            Nat.AddWordAt(24, c18, zz, 18);
-        }
-    }
-}
diff --git a/crypto/src/math/ec/custom/sec/Nat512.cs b/crypto/src/math/ec/custom/sec/Nat512.cs
deleted file mode 100644

index 46e10f995..000000000
--- a/crypto/src/math/ec/custom/sec/Nat512.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Diagnostics;
-
-namespace Org.BouncyCastle.Math.EC.Custom.Sec
-{
-    internal abstract class Nat512
-    {
-        public static void Mul(uint[] x, uint[] y, uint[] zz)
-        {
-            Nat256.Mul(x, y, zz);
-            Nat256.Mul(x, 8, y, 8, zz, 16);
-
-            uint c24 = Nat256.AddToEachOther(zz, 8, zz, 16);
-            uint c16 = c24 + Nat256.AddTo(zz, 0, zz, 8, 0);
-            c24 += Nat256.AddTo(zz, 24, zz, 16, c16);
-
-            uint[] dx = Nat256.Create(), dy = Nat256.Create();
-            bool neg = Nat256.Diff(x, 8, x, 0, dx, 0) != Nat256.Diff(y, 8, y, 0, dy, 0);
-
-            uint[] tt = Nat256.CreateExt();
-            Nat256.Mul(dx, dy, tt);
-
-            c24 += neg ? Nat.AddTo(16, tt, 0, zz, 8) : (uint)Nat.SubFrom(16, tt, 0, zz, 8);
-            Nat.AddWordAt(32, c24, zz, 24); 
-        }
-
-        public static void Square(uint[] x, uint[] zz)
-        {
-            Nat256.Square(x, zz);
-            Nat256.Square(x, 8, zz, 16);
-
-            uint c24 = Nat256.AddToEachOther(zz, 8, zz, 16);
-            uint c16 = c24 + Nat256.AddTo(zz, 0, zz, 8, 0);
-            c24 += Nat256.AddTo(zz, 24, zz, 16, c16);
-
-            uint[] dx = Nat256.Create();
-            Nat256.Diff(x, 8, x, 0, dx, 0);
-
-            uint[] m = Nat256.CreateExt();
-            Nat256.Square(dx, m);
-
-            c24 += (uint)Nat.SubFrom(16, m, 0, zz, 8);
-            Nat.AddWordAt(32, c24, zz, 24); 
-        }
-    }
-}
diff --git a/crypto/src/math/ec/custom/sec/SecP192K1Field.cs b/crypto/src/math/ec/custom/sec/SecP192K1Field.cs

index d5ca903d1..a00360360 100644
--- a/crypto/src/math/ec/custom/sec/SecP192K1Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecP192K1Field.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP192K1Field
diff --git a/crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs

index 78886dd8c..dce377035 100644
--- a/crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
diff --git a/crypto/src/math/ec/custom/sec/SecP192K1Point.cs b/crypto/src/math/ec/custom/sec/SecP192K1Point.cs

index 648aca502..58eb09102 100644
--- a/crypto/src/math/ec/custom/sec/SecP192K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecP192K1Point.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP192K1Point
diff --git a/crypto/src/math/ec/custom/sec/SecP192R1Field.cs b/crypto/src/math/ec/custom/sec/SecP192R1Field.cs

index 85e3a0394..096c2b51f 100644
--- a/crypto/src/math/ec/custom/sec/SecP192R1Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecP192R1Field.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP192R1Field
diff --git a/crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs

index 020c5cdbb..45bcb00f0 100644
--- a/crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs
@@ -1,5 +1,6 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
diff --git a/crypto/src/math/ec/custom/sec/SecP192R1Point.cs b/crypto/src/math/ec/custom/sec/SecP192R1Point.cs

index 797a8de35..3b53e341e 100644
--- a/crypto/src/math/ec/custom/sec/SecP192R1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecP192R1Point.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP192R1Point
diff --git a/crypto/src/math/ec/custom/sec/SecP224K1Field.cs b/crypto/src/math/ec/custom/sec/SecP224K1Field.cs

index a55810c6d..98cf777a5 100644
--- a/crypto/src/math/ec/custom/sec/SecP224K1Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecP224K1Field.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP224K1Field
diff --git a/crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs

index 72ff4b099..fec07436a 100644
--- a/crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
diff --git a/crypto/src/math/ec/custom/sec/SecP224K1Point.cs b/crypto/src/math/ec/custom/sec/SecP224K1Point.cs

index 8cbd29699..98cb29274 100644
--- a/crypto/src/math/ec/custom/sec/SecP224K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecP224K1Point.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP224K1Point
diff --git a/crypto/src/math/ec/custom/sec/SecP224R1Field.cs b/crypto/src/math/ec/custom/sec/SecP224R1Field.cs

index 559593c66..4f5c3bbda 100644
--- a/crypto/src/math/ec/custom/sec/SecP224R1Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecP224R1Field.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP224R1Field
diff --git a/crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs

index 06f47cded..2b9a06564 100644
--- a/crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs
@@ -1,5 +1,6 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
diff --git a/crypto/src/math/ec/custom/sec/SecP224R1Point.cs b/crypto/src/math/ec/custom/sec/SecP224R1Point.cs

index c3f4efb59..73c4f1948 100644
--- a/crypto/src/math/ec/custom/sec/SecP224R1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecP224R1Point.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP224R1Point
diff --git a/crypto/src/math/ec/custom/sec/SecP256K1Field.cs b/crypto/src/math/ec/custom/sec/SecP256K1Field.cs

index ba3a070a9..b0646e93f 100644
--- a/crypto/src/math/ec/custom/sec/SecP256K1Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecP256K1Field.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP256K1Field
diff --git a/crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs

index d9a039a4f..473113d0f 100644
--- a/crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
diff --git a/crypto/src/math/ec/custom/sec/SecP256K1Point.cs b/crypto/src/math/ec/custom/sec/SecP256K1Point.cs

index 3165682fa..072a0b969 100644
--- a/crypto/src/math/ec/custom/sec/SecP256K1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecP256K1Point.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP256K1Point
diff --git a/crypto/src/math/ec/custom/sec/SecP256R1Field.cs b/crypto/src/math/ec/custom/sec/SecP256R1Field.cs

index 9ed9dcd41..11594b2ba 100644
--- a/crypto/src/math/ec/custom/sec/SecP256R1Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecP256R1Field.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP256R1Field
diff --git a/crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs

index b22763cfa..d7838aead 100644
--- a/crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs
@@ -1,5 +1,6 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
diff --git a/crypto/src/math/ec/custom/sec/SecP256R1Point.cs b/crypto/src/math/ec/custom/sec/SecP256R1Point.cs

index 1de4a0b4a..83320824d 100644
--- a/crypto/src/math/ec/custom/sec/SecP256R1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecP256R1Point.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP256R1Point
diff --git a/crypto/src/math/ec/custom/sec/SecP384R1Field.cs b/crypto/src/math/ec/custom/sec/SecP384R1Field.cs

index 508b01e3c..7820775ee 100644
--- a/crypto/src/math/ec/custom/sec/SecP384R1Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecP384R1Field.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP384R1Field
diff --git a/crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs

index 40086978d..18d48a57d 100644
--- a/crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs
@@ -1,5 +1,6 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
diff --git a/crypto/src/math/ec/custom/sec/SecP384R1Point.cs b/crypto/src/math/ec/custom/sec/SecP384R1Point.cs

index 68c601611..83159ce61 100644
--- a/crypto/src/math/ec/custom/sec/SecP384R1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecP384R1Point.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP384R1Point
diff --git a/crypto/src/math/ec/custom/sec/SecP521R1Field.cs b/crypto/src/math/ec/custom/sec/SecP521R1Field.cs

index 3568156d8..b7f8eb146 100644
--- a/crypto/src/math/ec/custom/sec/SecP521R1Field.cs
+++ b/crypto/src/math/ec/custom/sec/SecP521R1Field.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP521R1Field
diff --git a/crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs

index 83a615928..6f02a7eb5 100644
--- a/crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs
@@ -1,5 +1,6 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
 using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
diff --git a/crypto/src/math/ec/custom/sec/SecP521R1Point.cs b/crypto/src/math/ec/custom/sec/SecP521R1Point.cs

index fb1996cfd..7ad97f76f 100644
--- a/crypto/src/math/ec/custom/sec/SecP521R1Point.cs
+++ b/crypto/src/math/ec/custom/sec/SecP521R1Point.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Org.BouncyCastle.Math.Raw;
+
 namespace Org.BouncyCastle.Math.EC.Custom.Sec
 {
     internal class SecP521R1Point