Add an extra bit to scalar fields of secp where necessary.

NilFoundation · May 20, 2024 · 4661461 · 4661461
1 parent dcda57b
commit 4661461
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 25 deletions.
diff --git a/include/nil/crypto3/algebra/curves/detail/babyjubjub/params.hpp b/include/nil/crypto3/algebra/curves/detail/babyjubjub/params.hpp
@@ -80,13 +80,8 @@ namespace nil {
                         template<typename Coordinates>
                         using group_type = babyjubjub_types::g1_type<forms::twisted_edwards, Coordinates>;
 
-#ifdef STANDARD_EC_INF_POINTS_ENABLED
                         constexpr static const std::array<typename base_field_type::value_type, 2> zero_fill = {
                             base_field_type::value_type::zero(), base_field_type::value_type::one()};
-#else
-                        constexpr static const std::array<typename base_field_type::value_type, 2> zero_fill = {
-                            base_field_type::value_type::zero(), base_field_type::value_type::zero()};
-#endif
 
                         constexpr static const std::array<typename base_field_type::value_type, 2> one_fill = {
                             typename base_field_type::value_type(

diff --git a/include/nil/crypto3/algebra/curves/detail/curve25519/params.hpp b/include/nil/crypto3/algebra/curves/detail/curve25519/params.hpp
@@ -63,13 +63,8 @@ namespace nil {
 #ifdef __ZKLLVM__
 #else
 
-#ifdef STANDARD_EC_INF_POINTS_ENABLED
                         constexpr static std::array<typename field_type::value_type, 2> zero_fill = {
                             field_type::value_type::zero(), field_type::value_type::one()};
-#else
-                        constexpr static std::array<typename field_type::value_type, 2> zero_fill = {
-                            field_type::value_type::zero(), field_type::value_type::zero()};
-#endif
 
                         constexpr static std::array<typename field_type::value_type, 2> one_fill = {
                             typename field_type::value_type(0x09u),

diff --git a/include/nil/crypto3/algebra/curves/detail/jubjub/params.hpp b/include/nil/crypto3/algebra/curves/detail/jubjub/params.hpp
@@ -91,13 +91,8 @@ namespace nil {
                         template<typename Coordinates>
                         using group_type = jubjub_types::g1_type<forms::twisted_edwards, Coordinates>;
 
-#ifdef STANDARD_EC_INF_POINTS_ENABLED
                         constexpr static const std::array<typename field_type::value_type, 2> zero_fill = {
                             field_type::value_type::zero(), field_type::value_type::one()};
-#else
-                        constexpr static const std::array<typename field_type::value_type, 2> zero_fill = {
-                            field_type::value_type::zero(), field_type::value_type::zero()};
-#endif
 
                         // according to https://neuromancer.sk/std/other/JubJub
                         constexpr static const std::array<typename field_type::value_type, 2> one_fill = {

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
@@ -45,9 +45,10 @@ namespace nil {
                 template<std::size_t Version>
                 struct secp_k1_scalar_field;
 
+                // We need to derive from field<161> here, since the modulus is actually 161 bits long.
                 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,7 +58,7 @@ namespace nil {
                     constexpr static const std::size_t number_bits = policy_type::number_bits;
 
                     constexpr static const integral_type modulus =
-                        0x0100000000000000000001b8fa16dfab9aca16b6b3_cppui_modular160;
+                        0x0100000000000000000001b8fa16dfab9aca16b6b3_cppui_modular161;
 
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus.backend();
@@ -101,9 +102,10 @@ namespace nil {
                     constexpr static const std::size_t arity = 1;
                 };
 
+                // We need to derive from field<225> here, since the modulus is actually 225 bits long.
                 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,7 +115,7 @@ namespace nil {
                     constexpr static const std::size_t number_bits = policy_type::number_bits;
 
                     constexpr static const integral_type modulus =
-                        0x010000000000000000000000000001dce8d2ec6184caf0a971769fb1f7_cppui_modular224;
+                        0x010000000000000000000000000001dce8d2ec6184caf0a971769fb1f7_cppui_modular225;
 
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus.backend();

diff --git a/include/nil/crypto3/algebra/fields/secp/secp_r1/scalar_field.hpp b/include/nil/crypto3/algebra/fields/secp/secp_r1/scalar_field.hpp
@@ -45,9 +45,10 @@ namespace nil {
                 template<std::size_t Version>
                 struct secp_r1_scalar_field;
 
+                // We need to derive from field<161> here, since the modulus is actually 161 bits long.
                 template<>
-                struct secp_r1_scalar_field<160> : public field<160> {
-                    typedef field<160> policy_type;
+                struct secp_r1_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,7 +58,7 @@ namespace nil {
                     constexpr static const std::size_t number_bits = policy_type::number_bits;
 
                     constexpr static const integral_type modulus =
-                        0x0100000000000000000001f4c8f927aed3ca752257_cppui_modular160;
+                        0x0100000000000000000001f4c8f927aed3ca752257_cppui_modular161;
 
                     typedef typename policy_type::modular_backend modular_backend;
                     constexpr static const modular_params_type modulus_params = modulus.backend();
@@ -67,7 +68,7 @@ namespace nil {
                             boost::multiprecision::backends::modular_params_ct<modular_backend, modulus_params>>>
                         modular_type;
 
-                    typedef typename detail::element_fp<params<secp_r1_scalar_field<160>>> value_type;
+                    typedef typename detail::element_fp<params<secp_r1_scalar_field<161>>> value_type;
 
                     constexpr static const std::size_t value_bits = modulus_bits;
                     constexpr static const std::size_t arity = 1;