elliptic-curve: move hash2field into hash2curve module (#903)

RustCrypto · Jan 18, 2022 · 27536e0 · 27536e0
1 parent 15d2c19
commit 27536e0
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/elliptic-curve/src/hash2curve.rs b/elliptic-curve/src/hash2curve.rs
@@ -3,11 +3,13 @@
 //! <https://datatracker.ietf.org/doc/draft-irtf-cfrg-hash-to-curve>
 
 mod group_digest;
+mod hash2field;
 mod isogeny;
 mod map2curve;
 mod osswu;
 
 pub use group_digest::*;
+pub use hash2field::*;
 pub use isogeny::*;
 pub use map2curve::*;
 pub use osswu::*;
diff --git a/elliptic-curve/src/hash2curve/group_digest.rs b/elliptic-curve/src/hash2curve/group_digest.rs
@@ -1,10 +1,7 @@
 //! Traits for handling hash to curve.
 
-use super::MapToCurve;
-use crate::{
- hash2field::{hash_to_field, ExpandMsg, FromOkm},
- ProjectiveArithmetic, Result,
-};
+use super::{hash_to_field, ExpandMsg, FromOkm, MapToCurve};
+use crate::{ProjectiveArithmetic, Result};
 use group::cofactor::CofactorGroup;
 
 /// Adds hashing arbitrary byte sequences to a valid group element

diff --git a/elliptic-curve/src/hash2field.rs → elliptic-curve/src/hash2curve/hash2field.rs b/elliptic-curve/src/hash2field.rs → elliptic-curve/src/hash2curve/hash2field.rs
@@ -31,6 +31,7 @@ pub trait FromOkm {
 ///
 /// [`ExpandMsgXmd`]: crate::hash2field::ExpandMsgXmd
 /// [`ExpandMsgXof`]: crate::hash2field::ExpandMsgXof
+#[doc(hidden)]
 pub fn hash_to_field<'a, E, T>(data: &[&[u8]], domain: &'a [u8], out: &mut [T]) -> Result<()>
 where
  E: ExpandMsg<'a>,

diff --git a/elliptic-curve/src/hash2field/expand_msg.rs → ...e/src/hash2curve/hash2field/expand_msg.rs b/elliptic-curve/src/hash2field/expand_msg.rs → ...e/src/hash2curve/hash2field/expand_msg.rs
diff --git a/...ic-curve/src/hash2field/expand_msg/xmd.rs → ...c/hash2curve/hash2field/expand_msg/xmd.rs b/...ic-curve/src/hash2field/expand_msg/xmd.rs → ...c/hash2curve/hash2field/expand_msg/xmd.rs
diff --git a/...ic-curve/src/hash2field/expand_msg/xof.rs → ...c/hash2curve/hash2field/expand_msg/xof.rs b/...ic-curve/src/hash2field/expand_msg/xof.rs → ...c/hash2curve/hash2field/expand_msg/xof.rs
diff --git a/elliptic-curve/src/lib.rs b/elliptic-curve/src/lib.rs
@@ -93,10 +93,6 @@ pub mod ecdh;
 #[cfg(feature = "jwk")]
 mod jwk;
 
-#[cfg(feature = "hash2curve")]
-#[doc(hidden)]
-pub mod hash2field;
-
 #[cfg(feature = "hash2curve")]
 #[cfg_attr(docsrs, doc(cfg(feature = "hash2curve")))]
 pub mod hash2curve;