From 85506039f6acabebcbeb5c285a113e4bdef3070a Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Thu, 29 Apr 2021 10:58:27 -0700 Subject: [PATCH] Bump `aes` and `ctr` crate dependencies to v0.7 (#283) --- .github/workflows/benches.yml | 69 ++++++++++++++-------------- .github/workflows/security-audit.yml | 49 ++++++++++---------- Cargo.lock | 21 ++++++--- Cargo.toml | 1 - aes-gcm-siv/Cargo.toml | 4 +- aes-gcm/Cargo.toml | 4 +- aes-siv/Cargo.toml | 4 +- ccm/Cargo.toml | 2 +- eax/Cargo.toml | 4 +- 9 files changed, 83 insertions(+), 75 deletions(-) diff --git a/.github/workflows/benches.yml b/.github/workflows/benches.yml index 32c67f42..3ab0873a 100644 --- a/.github/workflows/benches.yml +++ b/.github/workflows/benches.yml @@ -1,34 +1,35 @@ -name: benches - -on: - pull_request: - paths: - - "benches/**" - - "Cargo.*" - push: - branches: master - -defaults: - run: - working-directory: benches - -env: - CARGO_INCREMENTAL: 0 - RUSTFLAGS: "-Dwarnings" - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.41.0 # MSRV - - stable - steps: - - uses: actions/checkout@v1 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: ${{ matrix.rust }} - override: true - - run: cargo build --release +# TODO(tarcieri): re-enable after UHFs are bumped +#name: benches +# +#on: +# pull_request: +# paths: +# - "benches/**" +# - "Cargo.*" +# push: +# branches: master +# +#defaults: +# run: +# working-directory: benches +# +#env: +# CARGO_INCREMENTAL: 0 +# RUSTFLAGS: "-Dwarnings" +# +#jobs: +# build: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# rust: +# - 1.41.0 # MSRV +# - stable +# steps: +# - uses: actions/checkout@v1 +# - uses: actions-rs/toolchain@v1 +# with: +# profile: minimal +# toolchain: ${{ matrix.rust }} +# override: true +# - run: cargo build --release diff --git a/.github/workflows/security-audit.yml b/.github/workflows/security-audit.yml index d1549e17..957267c6 100644 --- a/.github/workflows/security-audit.yml +++ b/.github/workflows/security-audit.yml @@ -1,24 +1,25 @@ -name: Security Audit -on: - pull_request: - paths: Cargo.lock - push: - branches: master - paths: Cargo.lock - schedule: - - cron: "0 0 * * *" - -jobs: - security_audit: - name: Security Audit - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Cache cargo bin - uses: actions/cache@v1 - with: - path: ~/.cargo/bin - key: ${{ runner.os }}-cargo-audit-v0.12 - - uses: actions-rs/audit-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} +# TODO(tarcieri): re-enable after UHFs are bumped +#name: Security Audit +#on: +# pull_request: +# paths: Cargo.lock +# push: +# branches: master +# paths: Cargo.lock +# schedule: +# - cron: "0 0 * * *" +# +#jobs: +# security_audit: +# name: Security Audit +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v1 +# - name: Cache cargo bin +# uses: actions/cache@v1 +# with: +# path: ~/.cargo/bin +# key: ${{ runner.os }}-cargo-audit-v0.12 +# - uses: actions-rs/audit-check@v1 +# with: +# token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index 9b845b88..f5d657d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,12 +13,13 @@ dependencies = [ [[package]] name = "aes" -version = "0.7.0-pre" -source = "git+https://github.com/RustCrypto/block-ciphers.git#db3763260d02187f841ee57a51a83ce60045013d" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99446914425f48a667458b33c7fb920e24cf9e7c149a072a9fc420731b353835" dependencies = [ "cfg-if", "cipher", - "cpuid-bool", + "cpufeatures", "opaque-debug", ] @@ -141,12 +142,18 @@ dependencies = [ [[package]] name = "cmac" version = "0.6.0-pre" -source = "git+https://github.com/RustCrypto/MACs.git#4e07d942ff415b505798e31f1302704b618b1fd2" +source = "git+https://github.com/RustCrypto/MACs.git#6aa7c2075833ea7cca284780956720d1fe3dae96" dependencies = [ "crypto-mac", "dbl", ] +[[package]] +name = "cpufeatures" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd5a7748210e7ec1a9696610b1015e6e31fbf58f77a160801f124bd1c36592a" + [[package]] name = "cpuid-bool" version = "0.2.0" @@ -179,9 +186,9 @@ dependencies = [ [[package]] name = "ctr" -version = "0.7.0-pre.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67a289177c60cd23d34d30b01c0ae773806016eeaf9718d58a9ad9dd1e96e45" +checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481" dependencies = [ "cipher", ] @@ -352,7 +359,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "pmac" version = "0.6.0-pre" -source = "git+https://github.com/RustCrypto/MACs.git#4e07d942ff415b505798e31f1302704b618b1fd2" +source = "git+https://github.com/RustCrypto/MACs.git#6aa7c2075833ea7cca284780956720d1fe3dae96" dependencies = [ "crypto-mac", "dbl", diff --git a/Cargo.toml b/Cargo.toml index c263a409..10f49710 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,6 @@ members = [ ] [patch.crates-io] -aes = { git = "https://github.com/RustCrypto/block-ciphers.git" } chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } cmac = { git = "https://github.com/RustCrypto/MACs.git" } ghash = { git = "https://github.com/RustCrypto/universal-hashes.git" } diff --git a/aes-gcm-siv/Cargo.toml b/aes-gcm-siv/Cargo.toml index b8fa7249..d14f87ed 100644 --- a/aes-gcm-siv/Cargo.toml +++ b/aes-gcm-siv/Cargo.toml @@ -17,9 +17,9 @@ categories = ["cryptography", "no-std"] [dependencies] aead = { version = "0.4", default-features = false } -aes = { version = "=0.7.0-pre", optional = true } +aes = { version = "0.7", optional = true } cipher = "0.3" -ctr = "=0.7.0-pre.4" +ctr = "0.7" polyval = { version = "=0.5.0-pre", default-features = false } subtle = { version = "2", default-features = false } zeroize = { version = "1", default-features = false } diff --git a/aes-gcm/Cargo.toml b/aes-gcm/Cargo.toml index 7776ac07..9dc1f475 100644 --- a/aes-gcm/Cargo.toml +++ b/aes-gcm/Cargo.toml @@ -17,9 +17,9 @@ categories = ["cryptography", "no-std"] [dependencies] aead = { version = "0.4", default-features = false } -aes = { version = "=0.7.0-pre", optional = true } +aes = { version = "0.7", optional = true } cipher = "0.3" -ctr = "=0.7.0-pre.4" +ctr = "0.7" ghash = { version = "=0.4.0-pre", default-features = false } subtle = { version = "2", default-features = false } zeroize = { version = "1", optional = true, default-features = false } diff --git a/aes-siv/Cargo.toml b/aes-siv/Cargo.toml index aa56e721..60642ca3 100644 --- a/aes-siv/Cargo.toml +++ b/aes-siv/Cargo.toml @@ -17,11 +17,11 @@ categories = ["cryptography", "no-std"] [dependencies] aead = "0.4" -aes = "=0.7.0-pre" +aes = "0.7" cipher = "0.3" cmac = "=0.6.0-pre" crypto-mac = "0.11" -ctr = "=0.7.0-pre.4" +ctr = "0.7" dbl = "0.3" pmac = "=0.6.0-pre" zeroize = { version = "1", default-features = false } diff --git a/ccm/Cargo.toml b/ccm/Cargo.toml index c7a363de..bdc4b049 100644 --- a/ccm/Cargo.toml +++ b/ccm/Cargo.toml @@ -19,7 +19,7 @@ subtle = { version = "2", default-features = false } [dev-dependencies] aead = { version = "0.4", features = ["dev"], default-features = false } -aes = { version = "=0.7.0-pre", features = ["force-soft"] } # Uses `force-soft` for MSRV 1.41 +aes = { version = "0.7", features = ["force-soft"] } # Uses `force-soft` for MSRV 1.41 hex-literal = "0.2" [features] diff --git a/eax/Cargo.toml b/eax/Cargo.toml index e885dc23..6c951ae4 100644 --- a/eax/Cargo.toml +++ b/eax/Cargo.toml @@ -22,12 +22,12 @@ categories = ["cryptography", "no-std"] aead = { version = "0.4", default-features = false } cipher = "0.3" cmac = "=0.6.0-pre" -ctr = "=0.7.0-pre.4" +ctr = "0.7" subtle = { version = "2", default-features = false } [dev-dependencies] aead = { version = "0.4", features = ["dev"], default-features = false } -aes = { version = "=0.7.0-pre", features = ["force-soft"] } # Uses `force-soft` for MSRV 1.41 +aes = { version = "0.7", features = ["force-soft"] } # Uses `force-soft` for MSRV 1.41 [features] default = ["alloc"]