Merge branch 'master' into new_blb_format

Author: newpavlov

.github/workflows/fsb.yml

@@ -26,7 +26,7 @@ jobs:
   set-msrv:
     uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master
     with:
-        msrv: 1.85.0
+      msrv: 1.85.0
 
   build:
     needs: set-msrv
@@ -66,7 +66,8 @@ jobs:
       - uses: RustCrypto/actions/cargo-hack-install@master
       - run: cargo hack test --feature-powerset
 
-  minimal-versions:
-    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
-    with:
-        working-directory: ${{ github.workflow }}
+# Disabled until new `whirlpool` prerelease is cut (@tarcieri)
+#  minimal-versions:
+#    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
+#    with:
+#        working-directory: ${{ github.workflow }}

.github/workflows/k12.yml

@@ -26,7 +26,7 @@ jobs:
   set-msrv:
     uses: RustCrypto/actions/.github/workflows/set-msrv.yml@master
     with:
-        msrv: 1.85.0
+      msrv: 1.85.0
 
   build:
     needs: set-msrv
@@ -66,7 +66,8 @@ jobs:
       - uses: RustCrypto/actions/cargo-hack-install@master
       - run: cargo hack test --feature-powerset
 
-  minimal-versions:
-    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
-    with:
-        working-directory: ${{ github.workflow }}
+# Disabled until new `sha3` prerelease is cut (@tarcieri)
+#  minimal-versions:
+#    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
+#    with:
+#        working-directory: ${{ github.workflow }}

.github/workflows/sha1-checked.yml

@@ -51,10 +51,11 @@ jobs:
       - uses: RustCrypto/actions/cargo-hack-install@master
       - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std
 
-  minimal-versions:
-    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
-    with:
-      working-directory: ${{ github.workflow }}
+  # Disabled until new `sha1` prerelease is cut (@tarcieri)
+  #  minimal-versions:
+  #    uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
+  #    with:
+  #      working-directory: ${{ github.workflow }}
 
   # Linux tests
   linux:

Cargo.lock

@@ -37,9 +37,3 @@ whirlpool = { path = "whirlpool" }
 # https://github.com/RustCrypto/utils/pull/1187
 # https://github.com/RustCrypto/utils/pull/1207
 blobby = { git = "https://github.com/RustCrypto/utils" }
-# https://github.com/RustCrypto/traits/pull/1916
-# https://github.com/RustCrypto/traits/pull/1953
-# https://github.com/RustCrypto/traits/pull/1958
-digest = { git = "https://github.com/RustCrypto/traits" }
-# https://github.com/RustCrypto/utils/pull/1200
-block-buffer = { git = "https://github.com/RustCrypto/utils" }

Cargo.toml

@@ -16,8 +16,8 @@ keywords = ["hash", "ascon"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-digest = "0.11.0-rc.0"
-ascon = { version = "0.4", default-features = false }
+digest = "0.11.0-rc.1"
+ascon = { version = "0.5.0-rc.0", default-features = false }
 
 [dev-dependencies]
 spectral = { version = "0.6", default-features = false }

ascon-hash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "belt-hash"
-version = "0.2.0-rc.0"
+version = "0.2.0-rc.1"
 description = "BelT hash function (STB 34.101.31-2020)"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -13,11 +13,11 @@ keywords = ["belt", "stb", "hash", "digest"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-digest = "0.11.0-rc.0"
+digest = "0.11.0-rc.1"
 belt-block = { version = "0.1.1", default-features = false }
 
 [dev-dependencies]
-digest = { version = "0.11.0-rc.0", features = ["dev"] }
+digest = { version = "0.11.0-rc.1", features = ["dev"] }
 hex-literal = "1"
 base16ct = { version = "0.3", features = ["alloc"] }
 

belt-hash/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "blake2"
-version = "0.11.0-rc.0"
+version = "0.11.0-rc.2"
 description = "BLAKE2 hash functions"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
@@ -13,10 +13,10 @@ keywords = ["blake2", "hash", "digest"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-digest = { version = "0.11.0-rc.0", features = ["mac"] }
+digest = { version = "0.11.0-rc.1", features = ["mac"] }
 
 [dev-dependencies]
-digest = { version = "0.11.0-rc.0", features = ["dev"] }
+digest = { version = "0.11.0-rc.1", features = ["dev"] }
 hex-literal = "1"
 base16ct = { version = "0.3", features = ["alloc"] }
 

blake2/Cargo.toml

@@ -13,11 +13,11 @@ keywords = ["fsb", "hash", "digest"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-digest = "0.11.0-rc.0"
-whirlpool = { version = "0.11.0-rc.0", default-features = false }
+digest = "0.11.0-rc.1"
+whirlpool = { version = "0.11.0-rc.1", default-features = false }
 
 [dev-dependencies]
-digest = { version = "0.11.0-rc.0", features = ["dev"] }
+digest = { version = "0.11.0-rc.1", features = ["dev"] }
 hex-literal = "1"
 base16ct = { version = "0.3", features = ["alloc"] }
 

fsb/Cargo.toml

@@ -13,10 +13,10 @@ keywords = ["gost94", "gost", "hash", "digest"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-digest = "0.11.0-rc.0"
+digest = "0.11.0-rc.1"
 
 [dev-dependencies]
-digest = { version = "0.11.0-rc.0", features = ["dev"] }
+digest = { version = "0.11.0-rc.1", features = ["dev"] }
 hex-literal = "1"
 base16ct = { version = "0.3", features = ["alloc"] }