Merge branch 'md6' of https://github.com/iwiwsb/hashes into md6

RustCrypto · Nov 29, 2023 · 6476d63 · 6476d63
2 parents 08522b2 + 62b6ff1
commit 6476d63
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git 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
@@ -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

diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -167,7 +167,7 @@ pub type BeltHash = CoreWrapper<BeltHashCore>;
 
 /// 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]];