From d4039f263b1cbdd51a60f0fbf7839ee9951f4854 Mon Sep 17 00:00:00 2001 From: daxpedda Date: Tue, 15 Feb 2022 00:24:52 +0100 Subject: [PATCH] Bump MSRV and Rust edition --- .github/workflows/aes-gcm-siv.yml | 24 ++++------------------ .github/workflows/aes-gcm.yml | 28 ++++---------------------- .github/workflows/aes-siv.yml | 20 ++---------------- .github/workflows/benches.yml | 2 +- .github/workflows/ccm.yml | 24 ++++------------------ .github/workflows/chacha20poly1305.yml | 7 +++---- .github/workflows/deoxys.yml | 20 ++---------------- .github/workflows/eax.yml | 20 ++---------------- .github/workflows/mgm.yml | 22 +++----------------- .github/workflows/workspace.yml | 2 +- .github/workflows/xsalsa20poly1305.yml | 20 ++---------------- Cargo.toml | 1 + README.md | 20 +++++++++--------- aes-gcm-siv/CHANGELOG.md | 6 +++++- aes-gcm-siv/Cargo.toml | 5 +++-- aes-gcm-siv/README.md | 2 +- aes-gcm/CHANGELOG.md | 6 +++++- aes-gcm/Cargo.toml | 5 +++-- aes-gcm/README.md | 2 +- aes-siv/CHANGELOG.md | 6 +++++- aes-siv/Cargo.toml | 5 +++-- aes-siv/README.md | 2 +- ccm/CHANGELOG.md | 4 ++++ ccm/Cargo.toml | 3 ++- ccm/README.md | 2 +- chacha20poly1305/CHANGELOG.md | 6 +++++- chacha20poly1305/Cargo.toml | 5 +++-- chacha20poly1305/README.md | 2 +- chacha20poly1305/src/cipher.rs | 1 - deoxys/CHANGELOG.md | 6 +++++- deoxys/Cargo.toml | 5 +++-- deoxys/README.md | 2 +- deoxys/src/modes.rs | 1 - eax/CHANGELOG.md | 6 +++++- eax/Cargo.toml | 3 ++- eax/README.md | 2 +- mgm/CHANGELOG.md | 4 ++++ mgm/Cargo.toml | 3 ++- mgm/README.md | 2 +- mgm/src/gf/gf128_soft64.rs | 1 - mgm/src/gf/gf64_pclmul.rs | 1 - mgm/src/gf/gf64_soft64.rs | 1 - mgm/src/sealed.rs | 1 - xsalsa20poly1305/CHANGELOG.md | 6 +++++- xsalsa20poly1305/Cargo.toml | 5 +++-- xsalsa20poly1305/README.md | 6 +++--- 46 files changed, 117 insertions(+), 210 deletions(-) diff --git a/.github/workflows/aes-gcm-siv.yml b/.github/workflows/aes-gcm-siv.yml index 4c767f36..a4c23b0b 100644 --- a/.github/workflows/aes-gcm-siv.yml +++ b/.github/workflows/aes-gcm-siv.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.49.0 # MSRV + - 1.56.1 # MSRV - stable target: - armv7a-none-eabi @@ -45,7 +45,7 @@ jobs: include: # 32-bit Linux - target: i686-unknown-linux-gnu - rust: 1.49.0 # MSRV + rust: 1.56.1 # MSRV deps: sudo apt update && sudo apt install gcc-multilib - target: i686-unknown-linux-gnu rust: stable @@ -53,7 +53,7 @@ jobs: # 64-bit Linux - target: x86_64-unknown-linux-gnu - rust: 1.49.0 # MSRV + rust: 1.56.1 # MSRV - target: x86_64-unknown-linux-gnu rust: stable steps: @@ -67,21 +67,5 @@ jobs: - run: ${{ matrix.deps }} - run: cargo test --target ${{ matrix.target }} --release - run: cargo test --target ${{ matrix.target }} --release --features stream,std + - run: cargo test --target ${{ matrix.target }} --release --all-features - run: cargo build --target ${{ matrix.target }} --benches - - # TODO(tarcieri): re-unify this with `test` when MSRV is 1.51+ - heapless: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.51.0 # MSRV for `heapless` - - stable - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - - run: cargo test --release --all-features diff --git a/.github/workflows/aes-gcm.yml b/.github/workflows/aes-gcm.yml index bfe8003b..9cbb6c30 100644 --- a/.github/workflows/aes-gcm.yml +++ b/.github/workflows/aes-gcm.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.49.0 # MSRV + - 1.56.1 # MSRV - stable target: - armv7a-none-eabi @@ -45,7 +45,7 @@ jobs: include: # 32-bit Linux - target: i686-unknown-linux-gnu - rust: 1.49.0 # MSRV + rust: 1.56.1 # MSRV deps: sudo apt update && sudo apt install gcc-multilib - target: i686-unknown-linux-gnu rust: stable @@ -53,7 +53,7 @@ jobs: # 64-bit Linux - target: x86_64-unknown-linux-gnu - rust: 1.49.0 # MSRV + rust: 1.56.1 # MSRV - target: x86_64-unknown-linux-gnu rust: stable steps: @@ -67,25 +67,5 @@ jobs: - run: ${{ matrix.deps }} - run: cargo test --target ${{ matrix.target }} --release - run: cargo test --target ${{ matrix.target }} --release --features stream,std,zeroize + - run: cargo test --target ${{ matrix.target }} --release --all-features - run: cargo build --target ${{ matrix.target }} --benches - - # TODO(tarcieri): re-unify this with `test` when MSRV is 1.51+ - heapless: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.51.0 # MSRV for `heapless` - - stable - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - - run: cargo test --release --all-features - - - - diff --git a/.github/workflows/aes-siv.yml b/.github/workflows/aes-siv.yml index 815467e6..1f3b88f9 100644 --- a/.github/workflows/aes-siv.yml +++ b/.github/workflows/aes-siv.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.49.0 # MSRV + - 1.56.1 # MSRV - stable target: - armv7a-none-eabi @@ -43,7 +43,7 @@ jobs: strategy: matrix: rust: - - 1.49.0 # MSRV + - 1.56.1 # MSRV - stable steps: - uses: actions/checkout@v1 @@ -54,20 +54,4 @@ jobs: override: true - run: cargo test --release - run: cargo test --release --features stream,std - - # TODO(tarcieri): re-unify this with `test` when MSRV is 1.51+ - heapless: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.51.0 # MSRV for `heapless` - - stable - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - run: cargo test --release --all-features diff --git a/.github/workflows/benches.yml b/.github/workflows/benches.yml index 32c67f42..8d6b79fe 100644 --- a/.github/workflows/benches.yml +++ b/.github/workflows/benches.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.41.0 # MSRV + - 1.56.1 # MSRV - stable steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/ccm.yml b/.github/workflows/ccm.yml index b3e56d03..362087c6 100644 --- a/.github/workflows/ccm.yml +++ b/.github/workflows/ccm.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.41.0 # MSRV + - 1.56.1 # MSRV - stable target: - thumbv7em-none-eabi @@ -44,7 +44,7 @@ jobs: include: # 32-bit Linux - target: i686-unknown-linux-gnu - rust: 1.49.0 # MSRV + rust: 1.56.1 # MSRV deps: sudo apt update && sudo apt install gcc-multilib - target: i686-unknown-linux-gnu rust: stable @@ -52,7 +52,7 @@ jobs: # 64-bit Linux - target: x86_64-unknown-linux-gnu - rust: 1.49.0 # MSRV + rust: 1.56.1 # MSRV - target: x86_64-unknown-linux-gnu rust: stable steps: @@ -66,21 +66,5 @@ jobs: - run: ${{ matrix.deps }} - run: cargo test --target ${{ matrix.target }} --release - run: cargo test --target ${{ matrix.target }} --release --features stream,std + - run: cargo test --target ${{ matrix.target }} --release --all-features - run: cargo build --target ${{ matrix.target }} --benches - - # TODO(tarcieri): re-unify this with `test` when MSRV is 1.51+ - heapless: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.51.0 # MSRV for `heapless` - - stable - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - - run: cargo test --release --all-features diff --git a/.github/workflows/chacha20poly1305.yml b/.github/workflows/chacha20poly1305.yml index a587deca..b897650a 100644 --- a/.github/workflows/chacha20poly1305.yml +++ b/.github/workflows/chacha20poly1305.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.51.0 # MSRV + - 1.56.1 # MSRV - stable target: - armv7a-none-eabi @@ -46,7 +46,7 @@ jobs: include: # 32-bit Linux - target: i686-unknown-linux-gnu - rust: 1.51.0 # MSRV + rust: 1.56.1 # MSRV deps: sudo apt update && sudo apt install gcc-multilib - target: i686-unknown-linux-gnu rust: stable @@ -54,7 +54,7 @@ jobs: # 64-bit Linux - target: x86_64-unknown-linux-gnu - rust: 1.51.0 # MSRV + rust: 1.56.1 # MSRV - target: x86_64-unknown-linux-gnu rust: stable steps: @@ -71,4 +71,3 @@ jobs: - run: cargo test --target ${{ matrix.target }} --release --features reduced-round,stream,std - run: cargo test --target ${{ matrix.target }} --release --all-features - run: cargo build --target ${{ matrix.target }} --benches - diff --git a/.github/workflows/deoxys.yml b/.github/workflows/deoxys.yml index 93484b7a..1fc39f2d 100644 --- a/.github/workflows/deoxys.yml +++ b/.github/workflows/deoxys.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.50.0 # MSRV + - 1.56.1 # MSRV - stable target: - armv7a-none-eabi @@ -43,7 +43,7 @@ jobs: strategy: matrix: rust: - - 1.50.0 # MSRV + - 1.56.1 # MSRV - stable steps: - uses: actions/checkout@v1 @@ -54,20 +54,4 @@ jobs: override: true - run: cargo test --release - run: cargo test --release --features stream,std - - # TODO(tarcieri): re-unify this with `test` when MSRV is 1.51+ - heapless: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.51.0 # MSRV for `heapless` - - stable - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - run: cargo test --release --all-features diff --git a/.github/workflows/eax.yml b/.github/workflows/eax.yml index f8ffd6a9..8ffb80f3 100644 --- a/.github/workflows/eax.yml +++ b/.github/workflows/eax.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.41.0 # MSRV + - 1.56.1 # MSRV - stable target: - thumbv7em-none-eabi @@ -42,7 +42,7 @@ jobs: strategy: matrix: rust: - - 1.41.0 # MSRV + - 1.56.1 # MSRV - stable steps: - uses: actions/checkout@v1 @@ -53,20 +53,4 @@ jobs: override: true - run: cargo test --release - run: cargo test --release --features stream,std - - # TODO(tarcieri): re-unify this with `test` when MSRV is 1.51+ - heapless: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.51.0 # MSRV for `heapless` - - stable - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - run: cargo test --release --all-features diff --git a/.github/workflows/mgm.yml b/.github/workflows/mgm.yml index a988cb06..6ef71082 100644 --- a/.github/workflows/mgm.yml +++ b/.github/workflows/mgm.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.41.0 # MSRV + - 1.56.1 # MSRV - stable target: - thumbv7em-none-eabi @@ -42,7 +42,7 @@ jobs: strategy: matrix: rust: - - 1.41.0 # MSRV + - 1.56.1 # MSRV - stable steps: - uses: actions/checkout@v1 @@ -54,21 +54,5 @@ jobs: - run: cargo test --release - run: cargo test --release --features force-soft - run: cargo test --release --features stream,std - - run: RUSTFLAGS="-C target-cpu=native" cargo test --release --features stream,std - - # TODO(tarcieri): re-unify this with `test` when MSRV is 1.51+ - heapless: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.51.0 # MSRV for `heapless` - - stable - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - run: cargo test --release --all-features + - run: RUSTFLAGS="-C target-cpu=native" cargo test --release --features stream,std diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml index 7e6962ae..fb6f3c03 100644 --- a/.github/workflows/workspace.yml +++ b/.github/workflows/workspace.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.51.0 # MSRV (highest in repo) + toolchain: 1.56.1 # MSRV (highest in repo) components: clippy override: true profile: minimal diff --git a/.github/workflows/xsalsa20poly1305.yml b/.github/workflows/xsalsa20poly1305.yml index 01375e42..154d0eb1 100644 --- a/.github/workflows/xsalsa20poly1305.yml +++ b/.github/workflows/xsalsa20poly1305.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: rust: - - 1.49.0 # MSRV + - 1.56.1 # MSRV - stable target: - thumbv7em-none-eabi @@ -42,7 +42,7 @@ jobs: strategy: matrix: rust: - - 1.49.0 # MSRV + - 1.56.1 # MSRV - stable steps: - uses: actions/checkout@v1 @@ -53,20 +53,4 @@ jobs: override: true - run: cargo test --release - run: cargo test --release --features stream,std - - # TODO(tarcieri): re-unify this with `test` when MSRV is 1.51+ - heapless: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.51.0 # MSRV for `heapless` - - stable - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - run: cargo test --release --all-features diff --git a/Cargo.toml b/Cargo.toml index 5495592f..b749a21d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,7 @@ members = [ "mgm", "xsalsa20poly1305" ] +resolver = "2" [patch.crates-io] chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers" } diff --git a/README.md b/README.md index 8dc9dfa1..6562cf26 100644 --- a/README.md +++ b/README.md @@ -19,15 +19,15 @@ crate. | Name | Algorithm | Crates.io | Documentation | MSRV | |----------------------|------------------------------|-----------|---------------|-------| -| [`aes-gcm-siv`] | [AES-GCM-SIV] | [![crates.io](https://img.shields.io/crates/v/aes-gcm-siv.svg)](https://crates.io/crates/aes-gcm-siv) | [![Documentation](https://docs.rs/aes-gcm-siv/badge.svg)](https://docs.rs/aes-gcm-siv) | 1.49 | -| [`aes-gcm`] | [AES-GCM] | [![crates.io](https://img.shields.io/crates/v/aes-gcm.svg)](https://crates.io/crates/aes-gcm) | [![Documentation](https://docs.rs/aes-gcm/badge.svg)](https://docs.rs/aes-gcm) | 1.49 | -| [`aes-siv`] | [AES-SIV] | [![crates.io](https://img.shields.io/crates/v/aes-siv.svg)](https://crates.io/crates/aes-siv) | [![Documentation](https://docs.rs/aes-siv/badge.svg)](https://docs.rs/aes-siv) | 1.49 | -| [`ccm`] | [CCM] | [![crates.io](https://img.shields.io/crates/v/ccm.svg)](https://crates.io/crates/ccm) | [![Documentation](https://docs.rs/ccm/badge.svg)](https://docs.rs/ccm) | 1.41 | -| [`chacha20poly1305`] | [(X)ChaCha20Poly1305] | [![crates.io](https://img.shields.io/crates/v/chacha20poly1305.svg)](https://crates.io/crates/chacha20poly1305) | [![Documentation](https://docs.rs/chacha20poly1305/badge.svg)](https://docs.rs/chacha20poly1305) | 1.51 | -| [`deoxys`] | [Deoxys-I/II] | [![crates.io](https://img.shields.io/crates/v/deoxys.svg)](https://crates.io/crates/deoxys) | [![Documentation](https://docs.rs/deoxys/badge.svg)](https://docs.rs/deoxys) | 1.50 | -| [`eax`] | [EAX] | [![crates.io](https://img.shields.io/crates/v/eax.svg)](https://crates.io/crates/eax) | [![Documentation](https://docs.rs/eax/badge.svg)](https://docs.rs/eax) | 1.41 | -| [`mgm`] | [MGM] | [![crates.io](https://img.shields.io/crates/v/mgm.svg)](https://crates.io/crates/mgm) | [![Documentation](https://docs.rs/mgm/badge.svg)](https://docs.rs/mgm) | 1.41 | -| [`xsalsa20poly1305`] | [XSalsa20Poly1305] | [![crates.io](https://img.shields.io/crates/v/xsalsa20poly1305.svg)](https://crates.io/crates/xsalsa20poly1305) | [![Documentation](https://docs.rs/xsalsa20poly1305/badge.svg)](https://docs.rs/xsalsa20poly1305) | 1.49 | +| [`aes-gcm-siv`] | [AES-GCM-SIV] | [![crates.io](https://img.shields.io/crates/v/aes-gcm-siv.svg)](https://crates.io/crates/aes-gcm-siv) | [![Documentation](https://docs.rs/aes-gcm-siv/badge.svg)](https://docs.rs/aes-gcm-siv) | 1.56 | +| [`aes-gcm`] | [AES-GCM] | [![crates.io](https://img.shields.io/crates/v/aes-gcm.svg)](https://crates.io/crates/aes-gcm) | [![Documentation](https://docs.rs/aes-gcm/badge.svg)](https://docs.rs/aes-gcm) | 1.56 | +| [`aes-siv`] | [AES-SIV] | [![crates.io](https://img.shields.io/crates/v/aes-siv.svg)](https://crates.io/crates/aes-siv) | [![Documentation](https://docs.rs/aes-siv/badge.svg)](https://docs.rs/aes-siv) | 1.56 | +| [`ccm`] | [CCM] | [![crates.io](https://img.shields.io/crates/v/ccm.svg)](https://crates.io/crates/ccm) | [![Documentation](https://docs.rs/ccm/badge.svg)](https://docs.rs/ccm) | 1.56 | +| [`chacha20poly1305`] | [(X)ChaCha20Poly1305] | [![crates.io](https://img.shields.io/crates/v/chacha20poly1305.svg)](https://crates.io/crates/chacha20poly1305) | [![Documentation](https://docs.rs/chacha20poly1305/badge.svg)](https://docs.rs/chacha20poly1305) | 1.56 | +| [`deoxys`] | [Deoxys-I/II] | [![crates.io](https://img.shields.io/crates/v/deoxys.svg)](https://crates.io/crates/deoxys) | [![Documentation](https://docs.rs/deoxys/badge.svg)](https://docs.rs/deoxys) | 1.56 | +| [`eax`] | [EAX] | [![crates.io](https://img.shields.io/crates/v/eax.svg)](https://crates.io/crates/eax) | [![Documentation](https://docs.rs/eax/badge.svg)](https://docs.rs/eax) | 1.56 | +| [`mgm`] | [MGM] | [![crates.io](https://img.shields.io/crates/v/mgm.svg)](https://crates.io/crates/mgm) | [![Documentation](https://docs.rs/mgm/badge.svg)](https://docs.rs/mgm) | 1.56 | +| [`xsalsa20poly1305`] | [XSalsa20Poly1305] | [![crates.io](https://img.shields.io/crates/v/xsalsa20poly1305.svg)](https://crates.io/crates/xsalsa20poly1305) | [![Documentation](https://docs.rs/xsalsa20poly1305/badge.svg)](https://docs.rs/xsalsa20poly1305) | 1.56 | ## MSRV Policy @@ -75,7 +75,7 @@ dual licensed as above, without any additional terms or conditions. [`deoxys`]: https://github.com/RustCrypto/AEADs/tree/master/deoxys [`eax`]: https://github.com/RustCrypto/AEADs/tree/master/eax [`mgm`]: https://github.com/RustCrypto/AEADs/tree/master/mgm -[`xsalsa20poly1305`]: https://github.com/RustCrypto/AEADs/tree/master/xsalsa20poly1305 +[`xsalsa20poly1305`]: https://github.com/RustCrypto/AEADs/tree/master/xsalsa20poly1305 [//]: # (algorithms) diff --git a/aes-gcm-siv/CHANGELOG.md b/aes-gcm-siv/CHANGELOG.md index 0dca1c53..3e466093 100644 --- a/aes-gcm-siv/CHANGELOG.md +++ b/aes-gcm-siv/CHANGELOG.md @@ -9,7 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `aes` crate dependency to v0.8 ([#387]) - Bump `cipher` crate dependency to v0.4 ([#387]) - Bump `ctr` crate dependency to v0.9 ([#387]) -- Bump `zeroize` crate dependency to v1.5 ([#387]) +- Relax `zeroize` requirements ([#387]) +- Upgrade to Rust 2021 edition ([#387]) +- MSRV 1.56+ ([#387]) + +[#387]: https://github.com/RustCrypto/AEADs/pull/387 ## 0.10.3 (2021-08-28) ### Changed diff --git a/aes-gcm-siv/Cargo.toml b/aes-gcm-siv/Cargo.toml index 0706c953..57ce5fd3 100644 --- a/aes-gcm-siv/Cargo.toml +++ b/aes-gcm-siv/Cargo.toml @@ -7,7 +7,8 @@ Encryption Cipher (RFC 8452) with optional architecture-specific hardware acceleration """ authors = ["RustCrypto Developers"] -edition = "2018" +edition = "2021" +rust-version = "1.56" license = "MIT OR Apache-2.0" readme = "README.md" documentation = "https://docs.rs/aes-gcm-siv" @@ -22,7 +23,7 @@ cipher = "0.4" ctr = "0.9" polyval = { version = "0.5.1", default-features = false } subtle = { version = ">=2, <2.5", default-features = false } -zeroize = { version = "1.5", default-features = false } +zeroize = { version = "1", default-features = false } [dev-dependencies] aead = { version = "0.4", features = ["dev"], default-features = false } diff --git a/aes-gcm-siv/README.md b/aes-gcm-siv/README.md index 8bb57a65..dbbe38b4 100644 --- a/aes-gcm-siv/README.md +++ b/aes-gcm-siv/README.md @@ -69,7 +69,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/aes-gcm-siv/badge.svg [docs-link]: https://docs.rs/aes-gcm-siv/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg [codecov-image]: https://codecov.io/gh/RustCrypto/AEADs/branch/master/graph/badge.svg [codecov-link]: https://codecov.io/gh/RustCrypto/AEADs [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg diff --git a/aes-gcm/CHANGELOG.md b/aes-gcm/CHANGELOG.md index 4d0d3d14..90d9a156 100644 --- a/aes-gcm/CHANGELOG.md +++ b/aes-gcm/CHANGELOG.md @@ -9,7 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `aes` crate dependency to v0.8 ([#387]) - Bump `cipher` crate dependency to v0.4 ([#387]) - Bump `ctr` crate dependency to v0.9 ([#387]) -- Bump `zeroize` crate dependency to v1.5 ([#387]) +- Relax `zeroize` requirements ([#387]) +- Upgrade to Rust 2021 edition ([#387]) +- MSRV 1.56+ ([#387]) + +[#387]: https://github.com/RustCrypto/AEADs/pull/387 ## 0.9.4 (2021-08-28) ### Changed diff --git a/aes-gcm/Cargo.toml b/aes-gcm/Cargo.toml index 56ae618f..b51c156a 100644 --- a/aes-gcm/Cargo.toml +++ b/aes-gcm/Cargo.toml @@ -7,7 +7,8 @@ Authenticated Encryption with Associated Data (AEAD) Cipher with optional architecture-specific hardware acceleration """ authors = ["RustCrypto Developers"] -edition = "2018" +edition = "2021" +rust-version = "1.56" license = "Apache-2.0 OR MIT" readme = "README.md" documentation = "https://docs.rs/aes-gcm" @@ -22,7 +23,7 @@ cipher = "0.4" ctr = "0.9" ghash = { version = "0.4.2", default-features = false } subtle = { version = ">=2, <2.5", default-features = false } -zeroize = { version = "1.5", optional = true, default-features = false } +zeroize = { version = "1", optional = true, default-features = false } [dev-dependencies] aead = { version = "0.4", features = ["dev"], default-features = false } diff --git a/aes-gcm/README.md b/aes-gcm/README.md index 19f92ac9..fc9ccb70 100644 --- a/aes-gcm/README.md +++ b/aes-gcm/README.md @@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/aes-gcm/badge.svg [docs-link]: https://docs.rs/aes-gcm/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260038-AEADs [downloads-image]: https://img.shields.io/crates/d/aes-gcm.svg diff --git a/aes-siv/CHANGELOG.md b/aes-siv/CHANGELOG.md index e53d5bb2..fa4f4f91 100644 --- a/aes-siv/CHANGELOG.md +++ b/aes-siv/CHANGELOG.md @@ -11,7 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `cmac` crate dependency to v0.7 ([#387]) - Bump `ctr` crate dependency to v0.9 ([#387]) - Bump `pmac` crate dependency to v0.7 ([#387]) -- Bump `zeroize` crate dependency to v1.5 ([#387]) +- Relax `zeroize` requirements ([#387]) +- Upgrade to Rust 2021 edition ([#387]) +- MSRV 1.56+ ([#387]) + +[#387]: https://github.com/RustCrypto/AEADs/pull/387 ## 0.6.2 (2021-07-20) ### Changed diff --git a/aes-siv/Cargo.toml b/aes-siv/Cargo.toml index d15870a3..92b4a696 100644 --- a/aes-siv/Cargo.toml +++ b/aes-siv/Cargo.toml @@ -7,7 +7,8 @@ Encryption Cipher (RFC 5297) with optional architecture-specific hardware acceleration """ authors = ["RustCrypto Developers"] -edition = "2018" +edition = "2021" +rust-version = "1.56" license = "Apache-2.0 OR MIT" readme = "README.md" documentation = "https://docs.rs/aes-siv" @@ -24,7 +25,7 @@ crypto-mac = "0.11" ctr = "0.9" dbl = "0.3" pmac = { version = "0.7", optional = true } -zeroize = { version = "1.5", default-features = false } +zeroize = { version = "1", default-features = false } [dev-dependencies] blobby = "0.3" diff --git a/aes-siv/README.md b/aes-siv/README.md index b853abbf..34139e68 100644 --- a/aes-siv/README.md +++ b/aes-siv/README.md @@ -43,7 +43,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/aes-siv/badge.svg [docs-link]: https://docs.rs/aes-siv/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg [codecov-image]: https://codecov.io/gh/RustCrypto/AEADs/branch/master/graph/badge.svg [codecov-link]: https://codecov.io/gh/RustCrypto/AEADs [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg diff --git a/ccm/CHANGELOG.md b/ccm/CHANGELOG.md index fbc1270f..328bba29 100644 --- a/ccm/CHANGELOG.md +++ b/ccm/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bump `cipher` crate dependency to v0.4 ([#387]) - Bump `ctr` crate dependency to v0.9 ([#387]) +- Upgrade to Rust 2021 edition ([#387]) +- MSRV 1.56+ ([#387]) + +[#387]: https://github.com/RustCrypto/AEADs/pull/387 ## 0.4.4 (2021-07-20) ### Changed diff --git a/ccm/Cargo.toml b/ccm/Cargo.toml index 217446a8..8ef5ad74 100644 --- a/ccm/Cargo.toml +++ b/ccm/Cargo.toml @@ -3,7 +3,8 @@ name = "ccm" version = "0.4.4" description = "Generic implementation of the Counter with CBC-MAC (CCM) mode" authors = ["RustCrypto Developers"] -edition = "2018" +edition = "2021" +rust-version = "1.56" license = "Apache-2.0 OR MIT" readme = "README.md" documentation = "https://docs.rs/ccm" diff --git a/ccm/README.md b/ccm/README.md index 6bd935c8..cbc47443 100644 --- a/ccm/README.md +++ b/ccm/README.md @@ -44,7 +44,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/ccm/badge.svg [docs-link]: https://docs.rs/ccm [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg [codecov-image]: https://codecov.io/gh/RustCrypto/AEADs/branch/master/graph/badge.svg [codecov-link]: https://codecov.io/gh/RustCrypto/AEADs [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg diff --git a/chacha20poly1305/CHANGELOG.md b/chacha20poly1305/CHANGELOG.md index f7939ef8..828b25bc 100644 --- a/chacha20poly1305/CHANGELOG.md +++ b/chacha20poly1305/CHANGELOG.md @@ -8,7 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bump `cipher` crate dependency to v0.4 ([#387]) - Bump `chacha20` crate dependency to v0.9 ([#387]) -- Bump `zeroize` crate dependency to v1.5 ([#387]) +- Relax `zeroize` requirements ([#387]) +- Upgrade to Rust 2021 edition ([#387]) +- MSRV 1.56+ ([#387]) + +[#387]: https://github.com/RustCrypto/AEADs/pull/387 ## 0.9.0 (2021-08-29) ### Changed diff --git a/chacha20poly1305/Cargo.toml b/chacha20poly1305/Cargo.toml index 0e4ab323..59870b18 100644 --- a/chacha20poly1305/Cargo.toml +++ b/chacha20poly1305/Cargo.toml @@ -9,7 +9,8 @@ extended nonce variant of ChaCha20Poly1305, and the reduced-round ChaCha8Poly1305 and ChaCha12Poly1305 lightweight variants. """ authors = ["RustCrypto Developers"] -edition = "2018" +edition = "2021" +rust-version = "1.56" license = "Apache-2.0 OR MIT" readme = "README.md" documentation = "https://docs.rs/chacha20poly1305" @@ -22,7 +23,7 @@ aead = { version = "0.4", default-features = false } chacha20 = { version = "0.9", features = ["zeroize"] } cipher = "0.4" poly1305 = "0.7" -zeroize = { version = "1.5", default-features = false } +zeroize = { version = "1", default-features = false } [dev-dependencies] aead = { version = "0.4", features = ["dev"], default-features = false } diff --git a/chacha20poly1305/README.md b/chacha20poly1305/README.md index 39c4d82e..62ef8bf6 100644 --- a/chacha20poly1305/README.md +++ b/chacha20poly1305/README.md @@ -67,7 +67,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/chacha20poly1305/badge.svg [docs-link]: https://docs.rs/chacha20poly1305/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.51+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260038-AEADs [downloads-image]: https://img.shields.io/crates/d/chacha20poly1305.svg diff --git a/chacha20poly1305/src/cipher.rs b/chacha20poly1305/src/cipher.rs index 703d23ad..40fb9e68 100644 --- a/chacha20poly1305/src/cipher.rs +++ b/chacha20poly1305/src/cipher.rs @@ -3,7 +3,6 @@ use ::cipher::{StreamCipher, StreamCipherSeek}; use aead::generic_array::GenericArray; use aead::Error; -use core::convert::TryInto; use poly1305::{ universal_hash::{NewUniversalHash, UniversalHash}, Poly1305, diff --git a/deoxys/CHANGELOG.md b/deoxys/CHANGELOG.md index 4641686b..b99cbb81 100644 --- a/deoxys/CHANGELOG.md +++ b/deoxys/CHANGELOG.md @@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Changed - Bump `aes` crate dependency to v0.8 ([#387]) -- Bump `zeroize` crate dependency to v1.5 ([#387]) +- Relax `zeroize` requirements ([#387]) +- Upgrade to Rust 2021 edition ([#387]) +- MSRV 1.56+ ([#387]) + +[#387]: https://github.com/RustCrypto/AEADs/pull/387 ## 0.0.2 (2021-07-20) ### Changed diff --git a/deoxys/Cargo.toml b/deoxys/Cargo.toml index 81a84357..1ea2748f 100644 --- a/deoxys/Cargo.toml +++ b/deoxys/Cargo.toml @@ -14,13 +14,14 @@ homepage = "https://github.com/RustCrypto" keywords = ["aead", "deoxys", "deoxys-i", "deoxys-ii"] categories = ["cryptography", "no-std"] readme = "README.md" -edition = "2018" +edition = "2021" +rust-version = "1.56" [dependencies] aead = { version = "0.4", default-features = false } aes = { version = "0.8", features=["hazmat"], default-features = false } subtle = { version = ">=2, <2.5", default-features = false } -zeroize = { version = "1.5", default-features = false } +zeroize = { version = "1", default-features = false } [dev-dependencies] aead = { version = "0.4", features = ["dev"], default-features = false } diff --git a/deoxys/README.md b/deoxys/README.md index 1ddeeaaf..bcc00d2d 100644 --- a/deoxys/README.md +++ b/deoxys/README.md @@ -45,7 +45,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/deoxys/badge.svg [docs-link]: https://docs.rs/deoxys/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.50+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260038-AEADs [build-image]: https://github.com/RustCrypto/AEADs/workflows/deoxys/badge.svg?branch=master&event=push diff --git a/deoxys/src/modes.rs b/deoxys/src/modes.rs index 92b6a3ab..3c8bfb1c 100644 --- a/deoxys/src/modes.rs +++ b/deoxys/src/modes.rs @@ -1,4 +1,3 @@ -use core::convert::TryFrom; use core::marker::PhantomData; use aead::{ diff --git a/eax/CHANGELOG.md b/eax/CHANGELOG.md index 295049bd..3dde2833 100644 --- a/eax/CHANGELOG.md +++ b/eax/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `cipher` crate dependency to v0.4 ([#387]) - Bump `cmac` crate dependency to v0.7 ([#387]) - Bump `ctr` crate dependency to v0.9 ([#387]) +- Upgrade to Rust 2021 edition ([#387]) +- MSRV 1.56+ ([#387]) + +[#387]: https://github.com/RustCrypto/AEADs/pull/387 ## 0.4.1 (2021-07-20) ### Changed @@ -42,7 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Optional `std` feature; disabled by default ([#217]) ### Changed -- Use `aead` crate; MSRV 1.41+ +- Use `aead` crate; MSRV 1.56+ - Upgrade `aes` to v0.5, `block-cipher` to v0.8, `cmac` to v0.4, `ctr` to v0.5 ([#209]) [#217]: https://github.com/RustCrypto/AEADs/pull/217 diff --git a/eax/Cargo.toml b/eax/Cargo.toml index 4b14bdc4..4103ed29 100644 --- a/eax/Cargo.toml +++ b/eax/Cargo.toml @@ -10,7 +10,8 @@ This scheme is only based on a block cipher. It uses counter mode (CTR) for encryption and CBC mode for generating a OMAC/CMAC/CBCMAC (all names for the same thing). """ authors = ["RustCrypto Developers"] -edition = "2018" +edition = "2021" +rust-version = "1.56" license = "Apache-2.0 OR MIT" readme = "README.md" documentation = "https://docs.rs/eax" diff --git a/eax/README.md b/eax/README.md index 7ba96ac4..015272ec 100644 --- a/eax/README.md +++ b/eax/README.md @@ -35,7 +35,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/eax/badge.svg [docs-link]: https://docs.rs/eax/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg [codecov-image]: https://codecov.io/gh/RustCrypto/AEADs/branch/master/graph/badge.svg [codecov-link]: https://codecov.io/gh/RustCrypto/AEADs [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg diff --git a/mgm/CHANGELOG.md b/mgm/CHANGELOG.md index 7af59154..95fbfc0d 100644 --- a/mgm/CHANGELOG.md +++ b/mgm/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Changed - Bump `cipher` crate dependency to v0.4 ([#387]) +- Upgrade to Rust 2021 edition ([#387]) +- MSRV 1.56+ ([#387]) + +[#387]: https://github.com/RustCrypto/AEADs/pull/387 ## 0.4.6 (2021-09-01) ### Added diff --git a/mgm/Cargo.toml b/mgm/Cargo.toml index a4593af3..e554401e 100644 --- a/mgm/Cargo.toml +++ b/mgm/Cargo.toml @@ -3,7 +3,8 @@ name = "mgm" version = "0.4.6" description = "Generic implementation of the Multilinear Galois Mode (MGM) cipher" authors = ["RustCrypto Developers"] -edition = "2018" +edition = "2021" +rust-version = "1.56" license = "Apache-2.0 OR MIT" readme = "README.md" documentation = "https://docs.rs/mgm" diff --git a/mgm/README.md b/mgm/README.md index 33fd49ea..9ded649c 100644 --- a/mgm/README.md +++ b/mgm/README.md @@ -42,7 +42,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/mgm/badge.svg [docs-link]: https://docs.rs/mgm [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.41+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg [codecov-image]: https://codecov.io/gh/RustCrypto/AEADs/branch/master/graph/badge.svg [codecov-link]: https://codecov.io/gh/RustCrypto/AEADs [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg diff --git a/mgm/src/gf/gf128_soft64.rs b/mgm/src/gf/gf128_soft64.rs index 47d90430..39e6353a 100644 --- a/mgm/src/gf/gf128_soft64.rs +++ b/mgm/src/gf/gf128_soft64.rs @@ -1,6 +1,5 @@ use super::{utils::bmul64, GfElement}; use aead::{consts::U16, generic_array::GenericArray}; -use core::convert::TryInto; pub struct Element(u64, u64); diff --git a/mgm/src/gf/gf64_pclmul.rs b/mgm/src/gf/gf64_pclmul.rs index 19e2c0d2..c6534240 100644 --- a/mgm/src/gf/gf64_pclmul.rs +++ b/mgm/src/gf/gf64_pclmul.rs @@ -2,7 +2,6 @@ //! on `x86` and `x86_64` target architectures. use super::GfElement; use aead::{consts::U8, generic_array::GenericArray}; -use core::convert::TryInto; #[cfg(target_arch = "x86")] use core::arch::x86::*; diff --git a/mgm/src/gf/gf64_soft64.rs b/mgm/src/gf/gf64_soft64.rs index e4c9f2ea..7ff8877b 100644 --- a/mgm/src/gf/gf64_soft64.rs +++ b/mgm/src/gf/gf64_soft64.rs @@ -1,6 +1,5 @@ use super::{utils::bmul64, GfElement}; use aead::{consts::U8, generic_array::GenericArray}; -use core::convert::TryInto; pub struct Element(u64); diff --git a/mgm/src/sealed.rs b/mgm/src/sealed.rs index 79d8558c..14f31b8e 100644 --- a/mgm/src/sealed.rs +++ b/mgm/src/sealed.rs @@ -6,7 +6,6 @@ use aead::{ Error, }; use cipher::BlockSizeUser; -use core::convert::TryInto; pub type Counter = [<::BlockSize as Sealed>::Counter; 2]; diff --git a/xsalsa20poly1305/CHANGELOG.md b/xsalsa20poly1305/CHANGELOG.md index 85893410..38e1cf3f 100644 --- a/xsalsa20poly1305/CHANGELOG.md +++ b/xsalsa20poly1305/CHANGELOG.md @@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Changed - Bump `salsa20` crate dependency to v0.10 ([#387]) -- Bump `zeroize` crate dependency to v1.5 ([#387]) +- Relax `zeroize` requirements ([#387]) +- Upgrade to Rust 2021 edition ([#387]) +- MSRV 1.56+ ([#387]) + +[#387]: https://github.com/RustCrypto/AEADs/pull/387 ## 0.8.0 (2021-08-30) ### Changed diff --git a/xsalsa20poly1305/Cargo.toml b/xsalsa20poly1305/Cargo.toml index d7fb31b3..30ea902e 100644 --- a/xsalsa20poly1305/Cargo.toml +++ b/xsalsa20poly1305/Cargo.toml @@ -6,7 +6,8 @@ Pure Rust implementation of the XSalsa20Poly1305 (a.k.a. NaCl crypto_secretbox) authenticated encryption algorithm """ authors = ["RustCrypto Developers"] -edition = "2018" +edition = "2021" +rust-version = "1.56" license = "Apache-2.0 OR MIT" readme = "README.md" documentation = "https://docs.rs/xsalsa20poly1305" @@ -20,7 +21,7 @@ salsa20 = { version = "0.10", features = ["zeroize"] } poly1305 = "0.7" rand_core = { version = "0.6", optional = true } subtle = { version = ">=2, <2.5", default-features = false } -zeroize = { version = "1.5", default-features = false } +zeroize = { version = "1", default-features = false } [features] default = ["alloc", "rand_core", "aead/rand_core"] diff --git a/xsalsa20poly1305/README.md b/xsalsa20poly1305/README.md index 05bc1fd2..43af199b 100644 --- a/xsalsa20poly1305/README.md +++ b/xsalsa20poly1305/README.md @@ -10,13 +10,13 @@ **XSalsa20Poly1305** (a.k.a. NaCl [`crypto_secretbox`][1]) is an [authenticated encryption][2] cipher amenable to fast, constant-time -implementations in software, based on the [Salsa20][3] stream cipher +implementations in software, based on the [Salsa20][3] stream cipher (with [XSalsa20][4] 192-bit nonce extension) and the [Poly1305][5] universal hash function, which acts as a message authentication code. This algorithm has largely been replaced by the newer [ChaCha20Poly1305][6] (and the associated [XChaCha20Poly1305][7]) AEAD ciphers ([RFC 8439][8]), -but is useful for interoperability with legacy NaCl-based protocols. +but is useful for interoperability with legacy NaCl-based protocols. [Documentation][docs-link] @@ -50,7 +50,7 @@ dual licensed as above, without any additional terms or conditions. [docs-image]: https://docs.rs/xsalsa20poly1305/badge.svg [docs-link]: https://docs.rs/xsalsa20poly1305/ [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg [codecov-image]: https://codecov.io/gh/RustCrypto/AEADs/branch/master/graph/badge.svg [codecov-link]: https://codecov.io/gh/RustCrypto/AEADs [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg