From 7fcdd7c0531e5146a8a47dbeffecdff154d4d3de Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Thu, 17 Mar 2022 10:52:15 -0600 Subject: [PATCH] Fix `aes` and `kuznyechik` CI workflows (#311) Looks like they were broken in #284 --- .github/workflows/aes.yml | 9 +++++---- .github/workflows/kuznyechik.yml | 5 +++-- kuznyechik/src/soft/mod.rs | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/aes.yml b/.github/workflows/aes.yml index 3b3aa8b3..dc0c1633 100644 --- a/.github/workflows/aes.yml +++ b/.github/workflows/aes.yml @@ -3,6 +3,7 @@ name: aes on: pull_request: paths: + - ".github/workflows/aes.yml" - "aes/**" - "Cargo.*" push: @@ -39,8 +40,8 @@ jobs: override: true - run: cargo check - run: | - cargo build --target ${{ matrix.target }} - cargo build --target ${{ matrix.target }} --features hazmat + cargo build --target ${{ matrix.target }} + cargo build --target ${{ matrix.target }} --features hazmat - env: RUSTFLAGS: "-Dwarnings --cfg aes_force_soft" run: | @@ -205,8 +206,8 @@ jobs: tar -C /tmp -xzf /tmp/binaries.tar.gz mv /tmp/cross ~/.cargo/bin - run: | - cross test --package aes --target ${{ matrix.target }} - cross test --package aes --target ${{ matrix.target }} --features hazmat + cross test --package aes --target ${{ matrix.target }} + cross test --package aes --target ${{ matrix.target }} --features hazmat - env: RUSTFLAGS: "-Dwarnings --cfg aes_force_soft" run: | diff --git a/.github/workflows/kuznyechik.yml b/.github/workflows/kuznyechik.yml index f2179a1a..877db9de 100644 --- a/.github/workflows/kuznyechik.yml +++ b/.github/workflows/kuznyechik.yml @@ -3,6 +3,7 @@ name: kuznyechik on: pull_request: paths: + - ".github/workflows/kuznyechik.yml" - "kuznyechik/**" - "Cargo.*" push: @@ -62,8 +63,8 @@ jobs: override: true profile: minimal - run: | - cargo test - cargo test --all-features + cargo test + cargo test --all-features - env: RUSTFLAGS: "-Dwarnings --cfg kuznyechik_force_soft" run: | diff --git a/kuznyechik/src/soft/mod.rs b/kuznyechik/src/soft/mod.rs index 09ca882b..c972cbab 100644 --- a/kuznyechik/src/soft/mod.rs +++ b/kuznyechik/src/soft/mod.rs @@ -81,7 +81,7 @@ impl AlgorithmName for Kuznyechik { #[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))] impl Drop for Kuznyechik { fn drop(&mut self) { - self.keys.zeroize(); + self.keys.iter_mut().for_each(|key| key.zeroize()); } } @@ -135,7 +135,7 @@ impl AlgorithmName for KuznyechikEnc { #[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))] impl Drop for KuznyechikEnc { fn drop(&mut self) { - self.keys.zeroize(); + self.keys.iter_mut().for_each(|key| key.zeroize()); } } @@ -205,7 +205,7 @@ impl AlgorithmName for KuznyechikDec { #[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))] impl Drop for KuznyechikDec { fn drop(&mut self) { - self.keys.zeroize(); + self.keys.iter_mut().for_each(|key| key.zeroize()); } }