diff --git a/CHANGELOG.md b/CHANGELOG.md index d1f637c..c2fa0ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ Entries are listed in reverse chronological order. +## 1.1.4 + +* Fix typos in documentation comments. +* Remove unnecessary `Default` bound on `Scalar::from_hash`. + ## 1.1.3 * Reverts the change in 1.1.0 to allow owned and borrowed RNGs, which caused a breakage due to a subtle interaction with ownership rules. (The `RngCore` change is retained). diff --git a/Cargo.toml b/Cargo.toml index bab9c09..6f3ed15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "curve25519-dalek" -version = "1.1.3" +version = "1.1.4" authors = ["Isis Lovecruft ", "Henry de Valence "] readme = "README.md" diff --git a/src/backend/serial/curve_models/mod.rs b/src/backend/serial/curve_models/mod.rs index 8133818..d5e55fc 100644 --- a/src/backend/serial/curve_models/mod.rs +++ b/src/backend/serial/curve_models/mod.rs @@ -47,8 +47,7 @@ //! so that the curve is given by the pair of equations //! $$ //! \begin{aligned} -//! -W\_1\^2 + W\_2\^2 &= W\_3\^2 + dW\_0\^2, \\\\ -//! W_0 W_3 &= W_1 W_2. +//! -W\_1\^2 + W\_2\^2 &= W\_3\^2 + dW\_0\^2, \\\\ W_0 W_3 &= W_1 W_2. //! \end{aligned} //! $$ //! Up to variable naming, this is exactly the "extended" curve model diff --git a/src/backend/serial/u32/constants.rs b/src/backend/serial/u32/constants.rs index f5102f8..665937f 100644 --- a/src/backend/serial/u32/constants.rs +++ b/src/backend/serial/u32/constants.rs @@ -88,7 +88,7 @@ pub const ED25519_BASEPOINT_POINT: EdwardsPoint = EdwardsPoint{ /// the array is \\([i]P\\), where \\(P\\) is a point of order \\(8\\) /// generating \\(\mathcal E[8]\\). /// -/// Thus \\(\mathcal E[8]\\) is the points indexed by `0,2,4,6`, and +/// Thus \\(\mathcal E[4]\\) is the points indexed by `0,2,4,6`, and /// \\(\mathcal E[2]\\) is the points indexed by `0,4`. /// The Ed25519 basepoint has y = 4/5. This is called `_POINT` to /// distinguish it from `_TABLE`, which should be used for scalar diff --git a/src/backend/serial/u64/constants.rs b/src/backend/serial/u64/constants.rs index a5c1f07..17a1b5b 100644 --- a/src/backend/serial/u64/constants.rs +++ b/src/backend/serial/u64/constants.rs @@ -66,7 +66,7 @@ pub const ED25519_BASEPOINT_POINT: EdwardsPoint = EdwardsPoint{ /// the array is \\([i]P\\), where \\(P\\) is a point of order \\(8\\) /// generating \\(\mathcal E[8]\\). /// -/// Thus \\(\mathcal E[8]\\) is the points indexed by `0,2,4,6`, and +/// Thus \\(\mathcal E[4]\\) is the points indexed by `0,2,4,6`, and /// \\(\mathcal E[2]\\) is the points indexed by `0,4`. pub const EIGHT_TORSION: [EdwardsPoint; 8] = EIGHT_TORSION_INNER_DOC_HIDDEN; diff --git a/src/scalar.rs b/src/scalar.rs index fcdc196..a7a8310 100644 --- a/src/scalar.rs +++ b/src/scalar.rs @@ -599,7 +599,7 @@ impl Scalar { /// # } /// ``` pub fn from_hash(hash: D) -> Scalar - where D: Digest + Default + where D: Digest { let mut output = [0u8; 64]; output.copy_from_slice(hash.result().as_slice());