Updating v2 with latest voprf (v0.4.1) release (#366)

* Fix Clippy (#289) * Add Dependabot (#287) * Fix Clippy * Add Dependabot * Bump actions/checkout from 2 to 3 (#291) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/cache from 2 to 3 (#292) Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v2...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update dependencies (#288) * Fix Clippy * Update dependencies * Fix CI (#298) * Rename X25519 to Curve25519 (#302) * Update `curve25519-dalek` to 4.0.0-pre.5 (#301) * Update `curve25519-dalek` * Improve documentation * Update `voprf` to 0.5.0-pre.1 * Bump `voprf` to v0.5.0-pre.2 (#304) * Only use explicit crate features (#306) * Publishing v3.0.0-pre.1 (#309) * Update `rustyline` to v0.11 (#313) * Update VOPRF to draft 19 (#307) * Update `argon2` to v0.5 (#314) * Test P-384 (#290) * Update scrypt requirement from 0.10 to 0.11 (#315) Updates the requirements on [scrypt](https://github.com/RustCrypto/password-hashes) to permit the latest version. - [Release notes](https://github.com/RustCrypto/password-hashes/releases) - [Commits](RustCrypto/password-hashes@scrypt-v0.10.0...scrypt-v0.11.0) --- updated-dependencies: - dependency-name: scrypt dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Publishing v3.0.0-pre.2 (#318) * Bump `voprf` to v0.5.0-pre.4 (#322) * Correctly clamp Curve25519 secret keys (#323) * Curve25519 test vectors (#319) * Curve25519 test vectors * Adjust `derive_auth_keypair()` for Curve25519 * Update test vectors * Fix Curve25519 random scalar generation Co-Authored-By: Kevin Lewi <[email protected]> * Update test vectors * Update test vectors * Update test vectors --------- Co-authored-by: Kevin Lewi <[email protected]> * Updating dual-license language (#324) * Update criterion requirement from 0.4 to 0.5 (#325) Updates the requirements on [criterion](https://github.com/bheisler/criterion.rs) to permit the latest version. - [Changelog](https://github.com/bheisler/criterion.rs/blob/master/CHANGELOG.md) - [Commits](bheisler/criterion.rs@0.4.0...0.5.0) --- updated-dependencies: - dependency-name: criterion dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update keypair generation to use derive_auth_keypair (#326) * Fixing simple_login test to enable argon2 feature (#328) * Publishing v3.0.0-pre.3 (#327) * Update rustyline requirement from 11 to 12 (#332) Updates the requirements on [rustyline](https://github.com/kkawakam/rustyline) to permit the latest version. - [Release notes](https://github.com/kkawakam/rustyline/releases) - [Changelog](https://github.com/kkawakam/rustyline/blob/master/History.md) - [Commits](kkawakam/rustyline@v11.0.0...v12.0.0) --- updated-dependencies: - dependency-name: rustyline dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update parameter from sk to private_key (#329) * Bump `curve25519-dalek` to v4.0.0-rc.3 (#330) * add more resources (WebAssembly and React Native) (#335) * add more resources (WebAssembly and React Native) * Fixing clippy --------- Co-authored-by: Kevin Lewi <[email protected]> * Publishing v3.0.0-pre.4 (#337) * update docs: clarify export_key and session_key length (#338) * Increase MSRV to 1.70 and update workflow dependencies (#342) * Clarifying the persisting of server setup (#344) * Add `clippy::doc_markdown` (#346) * Fixing clippy errors (#347) * Test P-521 (#349) * Test P-521 * De-duplicate generic calls * Simplify full test vectors generation * Adding copyright header to generated test file (#351) * Update rustyline requirement from 12 to 13 (#352) Updates the requirements on [rustyline](https://github.com/kkawakam/rustyline) to permit the latest version. - [Release notes](https://github.com/kkawakam/rustyline/releases) - [Changelog](https://github.com/kkawakam/rustyline/blob/master/History.md) - [Commits](kkawakam/rustyline@v12.0.0...v13.0.0) --- updated-dependencies: - dependency-name: rustyline dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/cache from 3 to 4 (#354) Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Updating dependencies (#360) * docs: add details for client login final step (#358) This tweaks the documentation on the main module, in order to add some details on the outcome of the client login final step. In particular, it clarifies the result of `ClientLogin::finish()` both on success and on errors and it adds some intra-crate links to the relevant structures and fields. * Publishing v3.0.0-pre.5 (#364) * Revert "Update keypair generation to use derive_auth_keypair (#326)" This reverts commit deb7ca3. * Fixups to keep in sync with draft-10 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: daxpedda <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nik Graf <[email protected]> Co-authored-by: Luca Bruno <[email protected]>
facebook · Oct 10, 2024 · dc8246f · dc8246f
1 parent 556f6c2
commit dc8246f
Show file tree

Hide file tree

Showing 39 changed files with 735 additions and 704 deletions.
diff --git a/.cargo/license.rs b/.cargo/license.rs
@@ -1,6 +1,7 @@
-// Copyright (c) Facebook, Inc. and its affiliates.
+// Copyright (c) Meta Platforms, Inc. and affiliates.
 //
-// This source code is licensed under both the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree and the Apache
+// This source code is dual-licensed under either the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree or the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree.
+// of this source tree. You may select, at your option, one of the above-listed
+// licenses.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+
+updates:
+  - package-ecosystem: cargo
+    directory: /
+    schedule:
+      interval: daily
+
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,24 +13,21 @@ jobs:
       fail-fast: false
       matrix:
         backend_feature:
-          - --features ristretto255-u64,ristretto255-voprf
-          - --features ristretto255-u32,ristretto255-voprf
+          - --features ristretto255-voprf
           -
-          - --features x25519-u64,ristretto255-u64,ristretto255-voprf
-          - --features x25519-u32,ristretto255-u32,ristretto255-voprf
-          - --features x25519-u64
-          - --features x25519-u32
+          - --features curve25519,ristretto255-voprf
+          - --features curve25519
         frontend_feature:
           -
           - --features argon2
           - --features serde
         toolchain:
           - stable
-          - 1.57.0
+          - 1.74.0
     name: test
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@main
 
       - name: Install ${{ matrix.toolchain }} toolchain
         uses: actions-rs/toolchain@v1
@@ -61,16 +58,13 @@ jobs:
           # 32-bit x86
           - i686-unknown-linux-gnu
         backend_feature:
-          - --features ristretto255-u64,ristretto255-voprf
-          - --features ristretto255-u32,ristretto255-voprf
+          - --features ristretto255-voprf
           -
-          - x25519-u64,ristretto255-u64,ristretto255-voprf
-          - x25519-u32,ristretto255-u64,ristretto255-voprf
-          - x25519-u64
-          - x25519-u32
+          - curve25519,ristretto255-voprf
+          - curve25519
     steps:
-      - uses: actions/checkout@v2
-      - uses: hecrj/setup-rust-action@v1
+      - uses: actions/checkout@main
+      - uses: hecrj/setup-rust-action@v2
       - run: cargo install cross
       # Note: just use `cross` as you would `cargo`, but always
       # pass the `--target=${{ matrix.target }}` arg. (Yes, really).
@@ -84,13 +78,13 @@ jobs:
       matrix:
         toolchain:
           - stable
-          - 1.57.0
+          - 1.74.0
     name: test simple_login command-line example
     steps:
       - name: install expect
         run: sudo apt-get install expect
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@main
       - name: install rust
         uses: actions-rs/toolchain@v1
         with:
@@ -107,13 +101,13 @@ jobs:
       matrix:
         toolchain:
           - stable
-          - 1.57.0
+          - 1.74.0
     name: test digital_locker command-line example
     steps:
       - name: install expect
         run: sudo apt-get install expect
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@main
       - name: install rust
         uses: actions-rs/toolchain@v1
         with:
@@ -135,21 +129,18 @@ jobs:
           # for any no_std target
           - thumbv6m-none-eabi
         backend_feature:
-          - ristretto255-u64,ristretto255-voprf
-          - ristretto255-u32,ristretto255-voprf
+          - ristretto255-voprf
           -
-          - x25519-u64,ristretto255-u64,ristretto255-voprf
-          - x25519-u32,ristretto255-u32,ristretto255-voprf
-          - x25519-u64
-          - x25519-u32
+          - curve25519,ristretto255-voprf
+          - curve25519
         frontend_feature:
           - argon2
           - serde
     steps:
-      - uses: actions/checkout@v2
-      - uses: hecrj/setup-rust-action@v1
+      - uses: actions/checkout@main
+      - uses: hecrj/setup-rust-action@v2
       - run: rustup target add ${{ matrix.target }}
-      - run: cargo build --verbose --target=${{ matrix.target }} --no-default-features --features ${{ matrix.frontend_feature }} --features ${{ matrix.backend_feature }}
+      - run: cargo build --verbose --target=${{ matrix.target }} --no-default-features --features ${{ matrix.frontend_feature }},${{ matrix.backend_feature }}
 
   benches:
     name: cargo bench compilation
@@ -158,16 +149,13 @@ jobs:
       fail-fast: false
       matrix:
         backend_feature:
-          - --features ristretto255-u64,ristretto255-voprf
-          - --features ristretto255-u32,ristretto255-voprf
+          - --features ristretto255-voprf
           -
-          - --features x25519-u64,ristretto255-u64,ristretto255-voprf
-          - --features x25519-u32,ristretto255-u32,ristretto255-voprf
-          - --features x25519-u32
-          - --features x25519-u32
+          - --features curve25519,ristretto255-voprf
+          - --features curve25519
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@main
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -187,7 +175,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@main
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -201,22 +189,22 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-targets --features argon2,std,x25519-u64 -- -D warnings
+          args: --all-targets --features argon2,std,curve25519 -- -D warnings
 
       - name: Run cargo doc
         uses: actions-rs/cargo@v1
         env:
           RUSTDOCFLAGS: -D warnings
         with:
           command: doc
-          args: --no-deps --document-private-items --features argon2,std,x25519-u64
+          args: --no-deps --document-private-items --features argon2,std,curve25519
 
   format:
     name: cargo fmt
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@main
 
       - name: Install nightly toolchain
         uses: actions-rs/toolchain@v1
@@ -237,7 +225,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/.crates.toml
@@ -251,7 +239,7 @@ jobs:
         run: cargo install taplo-cli --locked 
 
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@main
 
       - name: Run Taplo
         run: taplo fmt --check
@@ -260,5 +248,5 @@ jobs:
     name: cargo-deny check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@main
       - uses: EmbarkStudios/cargo-deny-action@v1
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,12 +11,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        rust: [stable]
 
     steps:
-    - uses: hecrj/setup-rust-action@v1
+    - uses: hecrj/setup-rust-action@v2
       with:
         rust-version: ${{ matrix.rust }}
-    - uses: actions/checkout@master
+    - uses: actions/checkout@main
     - name: Login to crates.io
       run: cargo login $CRATES_IO_TOKEN
       env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.1.0-pre.1 (October 10, 2024)
+* Updated dependencies: voprf v0.4.1, curve25519-dalek v4
+
 ## 2.0.0 (September 21, 2022)
 * Synced implementation with draft-irtf-cfrg-opaque-10
 * Changed argon2 salt length to recommended value (16 bytes)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -27,4 +27,5 @@ outlined on that page and do not file a public issue.
 
 ## License
 By contributing to opaque-ke, you agree that your contributions will be
-licensed under the LICENSE file in the root directory of this source tree.
+licensed under both the LICENSE-MIT and LICENSE-APACHE files in the root
+directory of this source tree.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,76 +7,77 @@ keywords = ["cryptography", "crypto", "opaque", "passwords", "authentication"]
 license = "Apache-2.0 OR MIT"
 name = "opaque-ke"
 readme = "README.md"
-repository = "https://github.com/novifinancial/opaque-ke"
-rust-version = "1.57"
-version = "2.0.0"
+repository = "https://github.com/facebook/opaque-ke"
+rust-version = "1.74"
+version = "2.1.0-pre.1"
 
 [features]
-default = ["ristretto255-u64", "ristretto255-voprf", "serde"]
-ristretto255 = ["curve25519-dalek", "voprf/ristretto255"]
-ristretto255-fiat-u32 = ["curve25519-dalek/fiat_u32_backend", "ristretto255"]
-ristretto255-fiat-u64 = ["curve25519-dalek/fiat_u64_backend", "ristretto255"]
-ristretto255-simd = ["curve25519-dalek/simd_backend", "ristretto255"]
-ristretto255-u32 = ["curve25519-dalek/u32_backend", "ristretto255"]
-ristretto255-u64 = ["curve25519-dalek/u64_backend", "ristretto255"]
+argon2 = ["dep:argon2"]
+curve25519 = ["dep:curve25519-dalek"]
+default = ["ristretto255-voprf", "serde"]
+ristretto255 = ["dep:curve25519-dalek", "voprf/ristretto255"]
 ristretto255-voprf = ["ristretto255", "voprf/ristretto255-ciphersuite"]
-serde = ["serde_", "generic-array/serde", "voprf/serde"]
-std = ["getrandom"]
-x25519 = ["curve25519-dalek"]
-x25519-fiat-u32 = ["curve25519-dalek/fiat_u32_backend", "x25519"]
-x25519-fiat-u64 = ["curve25519-dalek/fiat_u64_backend", "x25519"]
-x25519-simd = ["curve25519-dalek/simd_backend", "x25519"]
-x25519-u32 = ["curve25519-dalek/u32_backend", "x25519"]
-x25519-u64 = ["curve25519-dalek/u64_backend", "x25519"]
+serde = ["dep:serde", "generic-array/serde", "voprf/serde"]
+std = ["dep:getrandom"]
 
 [dependencies]
-argon2 = { version = "0.4", default-features = false, features = [
+argon2 = { version = "0.5", default-features = false, features = [
   "alloc",
 ], optional = true }
-curve25519-dalek = { version = "=4.0.0-pre.1", default-features = false, optional = true }
-derive-where = { version = "=1.0.0-rc.3", features = ["zeroize-on-drop"] }
+curve25519-dalek = { version = "4", default-features = false, features = [
+  "zeroize",
+], optional = true }
+derive-where = { version = "1", features = ["zeroize-on-drop"] }
 digest = "0.10"
 displaydoc = { version = "0.2", default-features = false }
-elliptic-curve = { version = "0.12", features = ["hash2curve", "sec1"] }
+elliptic-curve = { version = "0.13", features = ["hash2curve", "sec1"] }
 generic-array = "0.14"
 hkdf = "0.12"
 hmac = "0.12"
 rand = { version = "0.8", default-features = false }
-serde_ = { version = "1", package = "serde", default-features = false, features = [
+serde = { version = "1", default-features = false, features = [
   "derive",
 ], optional = true }
 subtle = { version = "2.3", default-features = false }
-voprf = { version = "=0.4.0-pre.3", default-features = false, features = [
-  "danger",
-] }
+voprf = { version = "0.4.1", default-features = false, features = ["danger"] }
 zeroize = { version = "1.5", features = ["zeroize_derive"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.2", features = ["js"], optional = true }
 
 [dev-dependencies]
 bincode = "1"
-chacha20poly1305 = "=0.10.0-pre"
-criterion = "0.4"
+chacha20poly1305 = "0.10"
+criterion = "0.5"
 hex = "0.4"
 json = "0.12"
-p256 = { version = "0.11", default-features = false, features = [
+p256 = { version = "0.13", default-features = false, features = [
+  "hash2curve",
+  "voprf",
+] }
+p384 = { version = "0.13", default-features = false, features = [
+  "hash2curve",
+  "voprf",
+] }
+p521 = { version = "0.13.3", default-features = false, features = [
   "hash2curve",
   "voprf",
 ] }
 proptest = "1"
 rand = "0.8"
 regex = "1"
-rustyline = "9"
-scrypt = "0.10"
+# MSRV
+rustyline = "14"
+scrypt = "0.11"
 serde_json = "1"
 
 [[bench]]
 harness = false
 name = "opaque"
 
 [package.metadata.docs.rs]
-features = ["argon2", "std", "x25519-u64"]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
 targets = []
 
 [[example]]

diff --git a/LICENSE b/LICENSE