From e4c086ab59c81ffb390918c80c6bb95eba6ee49d Mon Sep 17 00:00:00 2001 From: Daan Sprenkels Date: Mon, 22 Jul 2019 14:17:23 +0200 Subject: [PATCH 1/4] Fix a typo in AVX2 Last two (least significant) limbs should be `z8`, `z9`. Were probably copy-paste typos. --- src/backend/vector/avx2/field.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/vector/avx2/field.rs b/src/backend/vector/avx2/field.rs index e7ee916..7fbae65 100644 --- a/src/backend/vector/avx2/field.rs +++ b/src/backend/vector/avx2/field.rs @@ -856,8 +856,8 @@ impl<'a, 'b> Mul<&'b FieldElement2625x4> for &'a FieldElement2625x4 { // z5 < ( 1 + 1 + 1 + 1 + 1 + 1 + 1*19 + 1*19 + 1*19 + 1*19 )*2^(51 + 2b) = 82*2^(51 + 2*b) // z6 < ( 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1*19 + 2*19 + 1*19 )*2^(51 + 2b) = 87*2^(51 + 2*b) // z7 < ( 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1*19 + 1*19 )*2^(51 + 2b) = 46*2^(51 + 2*b) - // z6 < ( 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1*19 )*2^(51 + 2b) = 33*2^(51 + 2*b) - // z7 < ( 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 )*2^(51 + 2b) = 10*2^(51 + 2*b) + // z8 < ( 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1 + 2 + 1*19 )*2^(51 + 2b) = 33*2^(51 + 2*b) + // z9 < ( 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 )*2^(51 + 2b) = 10*2^(51 + 2*b) // // So z[0] fits into a u64 if 51 + 2*b + lg(249) < 64 // if b < 2.5. From 78d9804bf98dbe2e04dcaa674f5b84a6aa074ca1 Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Tue, 30 Jul 2019 12:43:56 -0700 Subject: [PATCH 2/4] 'crypto' means 'cryptography' --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 518a76e..ba078f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/dalek-cryptography/curve25519-dalek" homepage = "https://dalek.rs/curve25519-dalek" documentation = "https://docs.rs/curve25519-dalek" categories = ["cryptography", "no-std"] -keywords = ["cryptography", "ristretto", "curve25519", "ECC"] +keywords = ["cryptography", "crypto", "ristretto", "curve25519", "elliptic curve"] description = "A pure-Rust implementation of group operations on ristretto255 and Curve25519" exclude = [ "**/.gitignore", From 5c18bfb6a7c3935901d86ae80afba30905279b87 Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Wed, 31 Jul 2019 14:53:12 -0700 Subject: [PATCH 3/4] Update doc(include) paths. Since https://github.com/rust-lang/rust/pull/60938 the path root changed and these new paths are required to compile on nightly. Closes #268. --- src/backend/vector/avx2/mod.rs | 2 +- src/backend/vector/ifma/mod.rs | 2 +- src/backend/vector/mod.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/vector/avx2/mod.rs b/src/backend/vector/avx2/mod.rs index 0b30085..a499e57 100644 --- a/src/backend/vector/avx2/mod.rs +++ b/src/backend/vector/avx2/mod.rs @@ -19,7 +19,7 @@ // missing). #![cfg_attr( all(feature = "nightly", feature = "stage2_build"), - doc(include = "../docs/avx2-notes.md") + doc(include = "../../docs/avx2-notes.md") )] pub(crate) mod field; diff --git a/src/backend/vector/ifma/mod.rs b/src/backend/vector/ifma/mod.rs index 996f941..6be5e72 100644 --- a/src/backend/vector/ifma/mod.rs +++ b/src/backend/vector/ifma/mod.rs @@ -9,7 +9,7 @@ #![cfg_attr( all(feature = "nightly", feature = "stage2_build"), - doc(include = "../docs/ifma-notes.md") + doc(include = "../../docs/ifma-notes.md") )] pub mod field; diff --git a/src/backend/vector/mod.rs b/src/backend/vector/mod.rs index 76d36ab..1b42da3 100644 --- a/src/backend/vector/mod.rs +++ b/src/backend/vector/mod.rs @@ -19,7 +19,7 @@ // missing). #![cfg_attr( all(feature = "nightly", feature = "stage2_build"), - doc(include = "../docs/parallel-formulas.md") + doc(include = "../../docs/parallel-formulas.md") )] #[cfg(not(any(target_feature = "avx2", target_feature = "avx512ifma", rustdoc)))] From e6d580b0cf34a3a39d28190eff68c63d04f1b85a Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Wed, 31 Jul 2019 15:22:31 -0700 Subject: [PATCH 4/4] Bump version to 1.2.2 --- CHANGELOG.md | 7 +++++++ Cargo.toml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 443a83c..98cd436 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ Entries are listed in reverse chronological order. +## 1.2.2 + +* Fix a typo in an internal doc-comment. +* Add the "crypto" tag to crate metadata. +* Fix compilation on nightly broken due to changes to the `#[doc(include)]` path + root. + ## 1.2.1 * Fix a bug in bucket index calculations in the Pippenger multiscalar algorithm diff --git a/Cargo.toml b/Cargo.toml index ba078f8..6243498 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "curve25519-dalek" -version = "1.2.1" +version = "1.2.2" authors = ["Isis Lovecruft ", "Henry de Valence "] readme = "README.md" @@ -9,7 +9,7 @@ repository = "https://github.com/dalek-cryptography/curve25519-dalek" homepage = "https://dalek.rs/curve25519-dalek" documentation = "https://docs.rs/curve25519-dalek" categories = ["cryptography", "no-std"] -keywords = ["cryptography", "crypto", "ristretto", "curve25519", "elliptic curve"] +keywords = ["cryptography", "crypto", "ristretto", "curve25519", "ristretto255"] description = "A pure-Rust implementation of group operations on ristretto255 and Curve25519" exclude = [ "**/.gitignore",