Merge pull request #4212 from randombit/jack/pcurves-impl

Move the pcurves implementation headers into a submodule
randombit · Jul 14, 2024 · 5d42faa · 5d42faa
2 parents 0c79081 + 8ba1209
commit 5d42faa
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 10 deletions.
diff --git a/src/lib/math/pcurves/info.txt b/src/lib/math/pcurves/info.txt
@@ -8,18 +8,8 @@ brief -> "Generalized elliptic curve arithmetic"
 type -> "Internal"
 </module_info>
 
-<requires>
-mp
-rng
-xmd
-</requires>
-
 <header:internal>
 pcurves.h
 pcurves_id.h
-pcurves_impl.h
-pcurves_util.h
-pcurves_solinas.h
-pcurves_wrap.h
 pcurves_instance.h
 </header:internal>
diff --git a/src/lib/math/pcurves/pcurves_brainpool256r1/info.txt b/src/lib/math/pcurves/pcurves_brainpool256r1/info.txt
@@ -7,3 +7,7 @@ name -> "PCurve brainpool256r1"
 brief -> "brainpool256r1"
 type -> "Internal"
 </module_info>
+
+<requires>
+pcurves_impl
+</requires>
diff --git a/src/lib/math/pcurves/pcurves_brainpool384r1/info.txt b/src/lib/math/pcurves/pcurves_brainpool384r1/info.txt
@@ -7,3 +7,7 @@ name -> "PCurve brainpool384r1"
 brief -> "brainpool384r1"
 type -> "Internal"
 </module_info>
+
+<requires>
+pcurves_impl
+</requires>
diff --git a/src/lib/math/pcurves/pcurves_brainpool512r1/info.txt b/src/lib/math/pcurves/pcurves_brainpool512r1/info.txt
@@ -7,3 +7,7 @@ name -> "PCurve brainpool512r1"
 brief -> "brainpool512r1"
 type -> "Internal"
 </module_info>
+
+<requires>
+pcurves_impl
+</requires>
diff --git a/src/lib/math/pcurves/pcurves_frp256v1/info.txt b/src/lib/math/pcurves/pcurves_frp256v1/info.txt
@@ -7,3 +7,7 @@ name -> "PCurve frp256v1"
 brief -> "frp256v1"
 type -> "Internal"
 </module_info>
+
+<requires>
+pcurves_impl
+</requires>
diff --git a/src/lib/math/pcurves/pcurves_impl/info.txt b/src/lib/math/pcurves/pcurves_impl/info.txt
@@ -0,0 +1,22 @@
+<defines>
+PCURVES_IMPL -> 20240714
+</defines>
+
+<module_info>
+name -> "Prime Order Curves Implementation Helpers"
+brief -> "Generalized elliptic curve arithmetic"
+type -> "Internal"
+</module_info>
+
+<requires>
+mp
+rng
+xmd
+</requires>
+
+<header:internal>
+pcurves_impl.h
+pcurves_solinas.h
+pcurves_util.h
+pcurves_wrap.h
+</header:internal>
diff --git a/src/lib/math/pcurves/pcurves_impl.h → .../math/pcurves/pcurves_impl/pcurves_impl.h b/src/lib/math/pcurves/pcurves_impl.h → .../math/pcurves/pcurves_impl/pcurves_impl.h
diff --git a/src/lib/math/pcurves/pcurves_solinas.h → ...th/pcurves/pcurves_impl/pcurves_solinas.h b/src/lib/math/pcurves/pcurves_solinas.h → ...th/pcurves/pcurves_impl/pcurves_solinas.h
diff --git a/src/lib/math/pcurves/pcurves_util.h → .../math/pcurves/pcurves_impl/pcurves_util.h b/src/lib/math/pcurves/pcurves_util.h → .../math/pcurves/pcurves_impl/pcurves_util.h
diff --git a/src/lib/math/pcurves/pcurves_wrap.h → .../math/pcurves/pcurves_impl/pcurves_wrap.h b/src/lib/math/pcurves/pcurves_wrap.h → .../math/pcurves/pcurves_impl/pcurves_wrap.h
diff --git a/src/lib/math/pcurves/pcurves_secp256k1/info.txt b/src/lib/math/pcurves/pcurves_secp256k1/info.txt
@@ -7,3 +7,7 @@ name -> "PCurve secp256k1"
 brief -> "secp256k1"
 type -> "Internal"
 </module_info>
+
+<requires>
+pcurves_impl
+</requires>
diff --git a/src/lib/math/pcurves/pcurves_secp256r1/info.txt b/src/lib/math/pcurves/pcurves_secp256r1/info.txt
@@ -7,3 +7,7 @@ name -> "PCurve secp256r1"
 brief -> "secp256r1"
 type -> "Internal"
 </module_info>
+
+<requires>
+pcurves_impl
+</requires>
diff --git a/src/lib/math/pcurves/pcurves_secp384r1/info.txt b/src/lib/math/pcurves/pcurves_secp384r1/info.txt
@@ -7,3 +7,7 @@ name -> "PCurve secp384r1"
 brief -> "secp384r1"
 type -> "Internal"
 </module_info>
+
+<requires>
+pcurves_impl
+</requires>
diff --git a/src/lib/math/pcurves/pcurves_secp521r1/info.txt b/src/lib/math/pcurves/pcurves_secp521r1/info.txt
@@ -7,3 +7,7 @@ name -> "PCurve secp521r1"
 brief -> "secp521r1"
 type -> "Internal"
 </module_info>
+
+<requires>
+pcurves_impl
+</requires>
diff --git a/src/lib/math/pcurves/pcurves_sm2p256v1/info.txt b/src/lib/math/pcurves/pcurves_sm2p256v1/info.txt
@@ -7,3 +7,7 @@ name -> "PCurve sm2p256v1"
 brief -> "sm2p256v1"
 type -> "Internal"
 </module_info>
+
+<requires>
+pcurves_impl
+</requires>