diff --git a/crypto/src/math/ec/ECCurve.cs b/crypto/src/math/ec/ECCurve.cs
index 245ca1941..ae0d5d69e 100644
--- a/crypto/src/math/ec/ECCurve.cs
+++ b/crypto/src/math/ec/ECCurve.cs
@@ -607,6 +607,13 @@ namespace Org.BouncyCastle.Math.EC
}
#endif
+ internal static int ImplGetInteger(string envVariable, int defaultValue)
+ {
+ string property = Platform.GetEnvironmentVariable(envVariable);
+
+ return int.TryParse(property, out int value) ? value : defaultValue;
+ }
+
private class DefaultLookupTable
: AbstractECLookupTable
{
@@ -757,13 +764,6 @@ namespace Org.BouncyCastle.Math.EC
throw new ArgumentException("Fp q value not prime");
}
- private static int ImplGetInteger(string envVariable, int defaultValue)
- {
- string property = Platform.GetEnvironmentVariable(envVariable);
-
- return int.TryParse(property, out int value) ? value : defaultValue;
- }
-
private static int ImplGetIterations(int bits, int certainty)
{
/*
@@ -966,6 +966,10 @@ namespace Org.BouncyCastle.Math.EC
private static IFiniteField BuildField(int m, int k1, int k2, int k3)
{
+ int maxM = ImplGetInteger("Org.BouncyCastle.EC.F2m_MaxSize", 1142); // 2 * 571
+ if (m > maxM)
+ throw new ArgumentException("F2m m value out of range");
+
int[] exponents = (k2 | k3) == 0
? new int[]{ 0, k1, m }
: new int[]{ 0, k1, k2, k3, m };
|
