From f3b657cfacbb9d8f2f37374717c9b8d64672542e Mon Sep 17 00:00:00 2001 From: Alexandr Kitaev Date: Wed, 22 Nov 2023 19:48:49 +0300 Subject: [PATCH 1/2] Expose belt_compress to public (#520) --- Cargo.lock | 8 ++++---- belt-hash/CHANGELOG.md | 6 ++++++ belt-hash/Cargo.toml | 2 +- belt-hash/src/lib.rs | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b676d7157..ca5e1d309 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -143,9 +143,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "md-5" @@ -316,6 +316,6 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/belt-hash/CHANGELOG.md b/belt-hash/CHANGELOG.md index 9e82e1692..449e99ef9 100644 --- a/belt-hash/CHANGELOG.md +++ b/belt-hash/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.1.1 (2022-11-22) +### Added +- `belt_compress` function ([#520]) + +[#520]: https://github.com/RustCrypto/hashes/pull/520 + ## 0.1.0 (2022-09-23) - Initial release ([#416]) diff --git a/belt-hash/Cargo.toml b/belt-hash/Cargo.toml index 14891c809..a104a1810 100644 --- a/belt-hash/Cargo.toml +++ b/belt-hash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "belt-hash" -version = "0.1.0" +version = "0.1.1" description = "BelT hash function (STB 34.101.31-2020)" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" diff --git a/belt-hash/src/lib.rs b/belt-hash/src/lib.rs index 925ca6094..29b9fbad8 100644 --- a/belt-hash/src/lib.rs +++ b/belt-hash/src/lib.rs @@ -167,7 +167,7 @@ pub type BeltHash = CoreWrapper; /// Compression function described in the section 6.3.2 #[inline(always)] -fn belt_compress(x1: [u32; 4], x2: [u32; 4], x34: [u32; 8]) -> ([u32; 4], [u32; 8]) { +pub fn belt_compress(x1: [u32; 4], x2: [u32; 4], x34: [u32; 8]) -> ([u32; 4], [u32; 8]) { let x3 = [x34[0], x34[1], x34[2], x34[3]]; let x4 = [x34[4], x34[5], x34[6], x34[7]]; From 62b6ff1c59878b4733c49f8164773c3009e4be03 Mon Sep 17 00:00:00 2001 From: Artyom Pavlov Date: Wed, 22 Nov 2023 21:01:45 +0300 Subject: [PATCH 2/2] Fix blake2 and ascon-hash CI (#521) --- .github/workflows/ascon-hash.yml | 6 ++++++ .github/workflows/blake2.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/ascon-hash.yml b/.github/workflows/ascon-hash.yml index 7b8e4e9bb..ef41d84b0 100644 --- a/.github/workflows/ascon-hash.yml +++ b/.github/workflows/ascon-hash.yml @@ -42,6 +42,9 @@ jobs: toolchain: ${{ matrix.rust }} targets: ${{ matrix.target }} - uses: RustCrypto/actions/cargo-hack-install@master + # TODO: remove after bump to MSRV 1.60+ + - run: cargo update + - run: cargo update -p zeroize --precise 1.6.0 - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std minimal-versions: @@ -64,4 +67,7 @@ jobs: with: toolchain: ${{ matrix.rust }} - uses: RustCrypto/actions/cargo-hack-install@master + # TODO: remove after bump to MSRV 1.60+ + - run: cargo update + - run: cargo update -p zeroize --precise 1.6.0 - run: cargo hack test --feature-powerset diff --git a/.github/workflows/blake2.yml b/.github/workflows/blake2.yml index 06b2e91b1..bac43c034 100644 --- a/.github/workflows/blake2.yml +++ b/.github/workflows/blake2.yml @@ -66,6 +66,7 @@ jobs: uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master with: working-directory: ${{ github.workflow }} + stable-cmd: cargo hack test --release --feature-powerset --exclude-features simd,simd_opt,simd_asm simd: runs-on: ubuntu-latest