pkcs5: bump aes, block-modes, hmac, and pbkdf2 (#388)

Bumps the following crate dependencies:
- `aes` v0.7
- `block-modes` v0.8
- `hmac` v0.11
- `pkbdf2` v0.8

Author: tarcieri

.github/workflows/pkcs5.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.47.0 # MSRV
+          - 1.49.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -48,7 +48,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.47.0 # MSRV
+          - 1.49.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v1

.github/workflows/pkcs8.yml

@@ -41,9 +41,33 @@ jobs:
           override: true
       - run: cargo build --release --target ${{ matrix.target }} --no-default-features
       - run: cargo build --release --target ${{ matrix.target }} --no-default-features --features alloc
-      - run: cargo build --release --target ${{ matrix.target }} --no-default-features --features encryption
       - run: cargo build --release --target ${{ matrix.target }} --no-default-features --features pem
-      - run: cargo build --release --target ${{ matrix.target }} --no-default-features --features pkcs5
+
+  # `pkcs5` crate is MSRV 1.49+
+  encryption:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - 1.49.0 # MSRV
+          - stable
+        target:
+          - thumbv7em-none-eabi
+          - wasm32-unknown-unknown
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          target: ${{ matrix.target }}
+          override: true
+      - run: cargo build --release --target ${{ matrix.target }} --no-default-features
+      - run: cargo build --release --target ${{ matrix.target }} --no-default-features --features alloc
+      - run: cargo build --release --target ${{ matrix.target }} --no-default-features --features pem
+      - run: cargo test --release --features encryption
+      - run: cargo test --release --features pkcs5
+      - run: cargo test --release --all-features
 
   test:
     runs-on: ubuntu-latest
@@ -62,7 +86,4 @@ jobs:
       - run: cargo test --release --no-default-features
       - run: cargo test --release
       - run: cargo test --release --features alloc
-      - run: cargo test --release --features encryption
       - run: cargo test --release --features pem
-      - run: cargo test --release --features pkcs5
-      - run: cargo test --release --all-features

.github/workflows/workspace.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.47.0 # Highest MSRV in repo
+        toolchain: 1.49.0 # Highest MSRV in repo
         components: clippy
         override: true
         profile: minimal

Cargo.lock

@@ -17,10 +17,10 @@ readme = "README.md"
 der = { version = "0.3", features = ["oid"], path = "../der" }
 spki = { version = "0.3", path = "../spki" }
 
-aes = { version = "0.6", optional = true }
-block-modes = { version = "0.7", optional = true, default-features = false }
-hmac = { version = "0.10", optional = true, default-features = false }
-pbkdf2 = { version = "0.7", optional = true, default-features = false }
+aes = { version = "0.7", optional = true }
+block-modes = { version = "0.8", optional = true, default-features = false }
+hmac = { version = "0.11", optional = true, default-features = false }
+pbkdf2 = { version = "0.8", optional = true, default-features = false }
 sha2 = { version = "0.9", optional = true, default-features = false }
 
 [dev-dependencies]

pkcs5/Cargo.toml

@@ -34,7 +34,7 @@ dual licensed as above, without any additional terms or conditions.
 [docs-image]: https://docs.rs/pkcs5/badge.svg
 [docs-link]: https://docs.rs/pkcs5/
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.47+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260052-utils
 [build-image]: https://github.com/RustCrypto/utils/workflows/pkcs5/badge.svg?branch=master&event=push

pkcs5/README.md

@@ -4,7 +4,7 @@
 //!
 //! # Minimum Supported Rust Version
 //!
-//! This crate requires **Rust 1.47** at a minimum.
+//! This crate requires **Rust 1.49** at a minimum.
 //!
 //! # Usage
 //!

pkcs5/src/lib.rs

@@ -33,11 +33,11 @@ pub fn encrypt_in_place<'b>(
 
     match params.encryption {
         EncryptionScheme::Aes128Cbc { iv } => {
-            let cipher = Aes128Cbc::new_var(key.as_slice(), iv).map_err(|_| CryptoError)?;
+            let cipher = Aes128Cbc::new_from_slices(key.as_slice(), iv).map_err(|_| CryptoError)?;
             cipher.encrypt(buffer, pos).map_err(|_| CryptoError)
         }
         EncryptionScheme::Aes256Cbc { iv } => {
-            let cipher = Aes256Cbc::new_var(key.as_slice(), iv).map_err(|_| CryptoError)?;
+            let cipher = Aes256Cbc::new_from_slices(key.as_slice(), iv).map_err(|_| CryptoError)?;
             cipher.encrypt(buffer, pos).map_err(|_| CryptoError)
         }
     }
@@ -59,11 +59,11 @@ pub fn decrypt_in_place<'a>(
 
     match params.encryption {
         EncryptionScheme::Aes128Cbc { iv } => {
-            let cipher = Aes128Cbc::new_var(key.as_slice(), iv).map_err(|_| CryptoError)?;
+            let cipher = Aes128Cbc::new_from_slices(key.as_slice(), iv).map_err(|_| CryptoError)?;
             cipher.decrypt(buffer).map_err(|_| CryptoError)
         }
         EncryptionScheme::Aes256Cbc { iv } => {
-            let cipher = Aes256Cbc::new_var(key.as_slice(), iv).map_err(|_| CryptoError)?;
+            let cipher = Aes256Cbc::new_from_slices(key.as_slice(), iv).map_err(|_| CryptoError)?;
             cipher.decrypt(buffer).map_err(|_| CryptoError)
         }
     }