secp_k1 values of cppui160 were incorrect, needed to be expanded to c…

…ppui161 for msvc as it is more strict. Taken from newer crypto3
GeniusVentures · Jan 15, 2025 · a3524ce · a3524ce
1 parent b1f31fc
commit a3524ce
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/include/nil/crypto3/algebra/fields/secp/secp_k1/base_field.hpp b/include/nil/crypto3/algebra/fields/secp/secp_k1/base_field.hpp
@@ -58,6 +58,8 @@ namespace nil {
 
                     constexpr static const integral_type modulus = 0xfffffffffffffffffffffffffffffffeffffac73_cppui160;
 
+					 constexpr static const integral_type group_order_minus_one_half = (modulus - 1) / 2;
+
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus;
                     typedef nil::crypto3::multiprecision::number<
@@ -85,6 +87,8 @@ namespace nil {
 
                     constexpr static const integral_type modulus =
                         0xfffffffffffffffffffffffffffffffffffffffeffffee37_cppui192;
+
+					 constexpr static const integral_type group_order_minus_one_half = (modulus - 1) / 2;
 
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus;
@@ -113,6 +117,8 @@ namespace nil {
 
                     constexpr static const integral_type modulus =
                         0xfffffffffffffffffffffffffffffffffffffffffffffffeffffe56d_cppui224;
+
+					 constexpr static const integral_type group_order_minus_one_half = (modulus - 1) / 2;
 
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus;
@@ -141,6 +147,8 @@ namespace nil {
 
                     constexpr static const integral_type modulus =
                         0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f_cppui256;
+
+					 constexpr static const integral_type group_order_minus_one_half = (modulus - 1) / 2;
 
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus;

diff --git a/include/nil/crypto3/algebra/fields/secp/secp_k1/scalar_field.hpp b/include/nil/crypto3/algebra/fields/secp/secp_k1/scalar_field.hpp
@@ -46,8 +46,8 @@ namespace nil {
                 struct secp_k1_scalar_field;
 
                 template<>
-                struct secp_k1_scalar_field<160> : public field<160> {
-                    typedef field<160> policy_type;
+                struct secp_k1_scalar_field<160> : public field<161> {
+                    typedef field<161> policy_type;
 
                     constexpr static const std::size_t modulus_bits = policy_type::modulus_bits;
                     typedef typename policy_type::integral_type integral_type;
@@ -57,8 +57,8 @@ namespace nil {
                     constexpr static const std::size_t number_bits = policy_type::number_bits;
 
                     constexpr static const integral_type modulus =
-                        0x0100000000000000000001b8fa16dfab9aca16b6b3_cppui160;
-
+                        0x0100000000000000000001b8fa16dfab9aca16b6b3_cppui161;
+					constexpr static const integral_type group_order_minus_one_half = (modulus - 1) / 2;
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus;
                     typedef nil::crypto3::multiprecision::number<
@@ -87,6 +87,8 @@ namespace nil {
                     constexpr static const integral_type modulus =
                         0xfffffffffffffffffffffffe26f2fc170f69466a74defd8d_cppui192;
 
+					constexpr static const integral_type group_order_minus_one_half = (modulus - 1) / 2;
+
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus;
                     typedef nil::crypto3::multiprecision::number<
@@ -102,8 +104,8 @@ namespace nil {
                 };
 
                 template<>
-                struct secp_k1_scalar_field<224> : public field<224> {
-                    typedef field<224> policy_type;
+                struct secp_k1_scalar_field<224> : public field<225> {
+                    typedef field<225> policy_type;
 
                     constexpr static const std::size_t modulus_bits = policy_type::modulus_bits;
                     typedef typename policy_type::integral_type integral_type;
@@ -113,8 +115,10 @@ namespace nil {
                     constexpr static const std::size_t number_bits = policy_type::number_bits;
 
                     constexpr static const integral_type modulus =
-                        0x010000000000000000000000000001dce8d2ec6184caf0a971769fb1f7_cppui224;
-
+                        0x010000000000000000000000000001dce8d2ec6184caf0a971769fb1f7_cppui225;
+
+					constexpr static const integral_type group_order_minus_one_half = (modulus - 1) / 2;
+
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus;
                     typedef nil::crypto3::multiprecision::number<
@@ -123,7 +127,7 @@ namespace nil {
                             nil::crypto3::multiprecision::backends::modular_params_ct<modular_backend, modulus_params>>>
                         modular_type;
 
-                    typedef typename detail::element_fp<params<secp_k1_scalar_field<224>>> value_type;
+                    typedef typename detail::element_fp<params<secp_k1_scalar_field<225>>> value_type;
 
                     constexpr static const std::size_t value_bits = modulus_bits;
                     constexpr static const std::size_t arity = 1;
@@ -142,7 +146,9 @@ namespace nil {
 
                     constexpr static const integral_type modulus =
                         0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141_cppui256;
-
+
+					constexpr static const integral_type group_order_minus_one_half = (modulus - 1) / 2;
+
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus;
                     typedef nil::crypto3::multiprecision::number<

diff --git a/include/nil/crypto3/detail/literals.hpp b/include/nil/crypto3/detail/literals.hpp
@@ -40,6 +40,7 @@ BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(150)
 BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(151)
 BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(152)
 BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(160)
+BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(161)
 BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(163)
 BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(164)
 BOOST_MP_DEFINE_SIZED_CPP_INT_LITERAL(177)