Merge branch 'main' into release/3.2

.github/workflows/rust.yml

@@ -0,0 +1,131 @@
+name: Rust
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ main, develop ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  test-u32:
+    name: Test u32 backend
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+    - uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --no-default-features --features "std u32_backend"
+
+  test-u64:
+    name: Test u64 backend
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+    - uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --no-default-features --features "std u64_backend"
+
+  test-simd:
+    name: Test simd backend (nightly)
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: nightly
+        override: true
+    - uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --no-default-features --features "std simd_backend"
+
+  test-defaults-serde:
+    name: Test default feature selection and serde
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+    - uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --features "serde"
+
+  test-alloc-u32:
+    name: Test no_std+alloc with u32 backend
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+    - uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --lib --no-default-features --features "alloc u32_backend"
+
+  nightly:
+    name: Test nightly compiler
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: nightly
+        override: true
+    - uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --features "nightly"
+
+  msrv:
+    name: Current MSRV is 1.41
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: 1.41
+        override: true
+    - uses: actions-rs/cargo@v1
+      with:
+        command: build
+
+  bench:
+    name: Check that benchmarks compile
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+    - uses: actions-rs/cargo@v1
+      with:
+        command: bench
+        # This filter selects no benchmarks, so we don't run any, only build them.
+        args: "DONTRUNBENCHMARKS"

Cargo.toml

@@ -33,7 +33,7 @@ travis-ci = { repository = "dalek-cryptography/curve25519-dalek", branch = "mast
 [dev-dependencies]
 sha2 = { version = "0.9", default-features = false }
 bincode = "1"
-criterion = "0.3.0"
+criterion = { version = "0.3.0", features = ["html_reports"] }
 hex = "0.4.2"
 rand = "0.7"
 
@@ -50,7 +50,7 @@ serde = { version = "1.0", default-features = false, optional = true, features =
 # The original packed_simd package was orphaned, see
 # https://github.com/rust-lang/packed_simd/issues/303#issuecomment-701361161
 packed_simd = { version = "0.3.4", package = "packed_simd_2", features = ["into_bits"], optional = true }
-zeroize = { version = "1", default-features = false }
+zeroize = { version = ">=1, <1.4", default-features = false }
 fiat-crypto = { version = "0.1.6", optional = true}
 
 [features]

README.md

@@ -177,7 +177,7 @@ that primitive.
 Please see [CONTRIBUTING.md][contributing].
 
 Patches and pull requests should be make against the `develop`
-branch, **not** `master`.
+branch, **not** `main`.
 
 # About
 

benches/dalek_benchmarks.rs

@@ -180,12 +180,12 @@ mod multiscalar_benches {
         dynamic_fraction: f64,
     ) {
         for multiscalar_size in &MULTISCALAR_SIZES {
-            c.bench_with_input(
-                BenchmarkId::new(
-                    "Variable-time mixed-base multiscalar multiplication ({:.0}pct dyn)",
-                    format!("({:.0}pct dyn)", 100.0 * dynamic_fraction),
-                ),
-                &multiscalar_size,
+            let bench_id = BenchmarkId::new(
+                "Variable-time mixed-base",
+                format!("(size: {:?}), ({:.0}pct dyn)", multiscalar_size, 100.0 * dynamic_fraction),
+            );
+
+            c.bench_with_input(bench_id, &multiscalar_size,
                 move |b, &&total_size| {
                     let dynamic_size = ((total_size as f64) * dynamic_fraction) as usize;
                     let static_size = total_size - dynamic_size;
@@ -221,16 +221,18 @@ mod multiscalar_benches {
     }
 
     fn multiscalar_multiplications(c: &mut Criterion) {
-        let mut group: BenchmarkGroup<_> = c.benchmark_group("Multiscalar muls");
+        let mut group: BenchmarkGroup<_> = c.benchmark_group("Multiscalar multiplications");
 
         consttime_multiscalar_mul(&mut group);
         vartime_multiscalar_mul(&mut group);
         vartime_precomputed_pure_static(&mut group);
 
         let dynamic_fracs = [0.0, 0.2, 0.5];
+
         for frac in dynamic_fracs.iter() {
             vartime_precomputed_helper(&mut group, *frac);
         }
+
         group.finish();
     }