Reduce amount of unsafe and use new imports (#351)

Author: newpavlov

.github/actions/cross-tests/action.yml

@@ -22,14 +22,15 @@ runs:
           override: true
       - name: Install precompiled cross
         run: |
-          export URL=$(curl -s https://api.github.com/repos/rust-embedded/cross/releases/latest | \
+          export URL=$(curl -s https://api.github.com/repos/cross-rs/cross/releases/latest | \
             jq -r '.assets[] | select(.name | contains("x86_64-unknown-linux-gnu.tar.gz")) | .browser_download_url')
           wget -O /tmp/binaries.tar.gz $URL
           tar -C /tmp -xzf /tmp/binaries.tar.gz
           mv /tmp/cross ~/.cargo/bin
         shell: bash
-      - run: |
-          cd ${{ inputs.package }}
-          cross test --target ${{ inputs.target }} --no-default-features \
-            --features ${{ inputs.features }}
+      - run: cross test
+          --package ${{ inputs.package }}
+          --target ${{ inputs.target }}
+          --no-default-features
+          --features ${{ inputs.features }}
         shell: bash

.github/workflows/sha1.yml

@@ -137,11 +137,10 @@ jobs:
 
   # Cross-compiled tests
   cross:
-    needs: set-msrv
     strategy:
       matrix:
         rust:
-          - ${{needs.set-msrv.outputs.msrv}}
+          - 1.51 # 1.41-1.50 `--features` can't be used inside virtual manifest
           - stable
         target:
           - aarch64-unknown-linux-gnu

.github/workflows/sha2.yml

@@ -134,11 +134,10 @@ jobs:
 
   # Cross-compiled tests
   cross:
-    needs: set-msrv
     strategy:
       matrix:
         rust:
-          - ${{needs.set-msrv.outputs.msrv}}
+          - 1.51 # 1.41-1.50 `--features` can't be used inside virtual manifest
           - stable
         target:
           - aarch64-unknown-linux-gnu

.github/workflows/sha3.yml

@@ -71,11 +71,10 @@ jobs:
 
   # Cross-compiled tests
   cross:
-    needs: set-msrv
     strategy:
       matrix:
         rust:
-          - ${{needs.set-msrv.outputs.msrv}}
+          - 1.51 # 1.41-1.50 `--features` can't be used inside virtual manifest
           - stable
         target:
           - aarch64-unknown-linux-gnu

Cargo.lock

@@ -12,10 +12,10 @@ keywords = ["crypto", "blake2", "hash", "digest"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-digest = { version = "0.10", features = ["mac"] }
+digest = { version = "0.10.2", features = ["mac"] }
 
 [dev-dependencies]
-digest = { version = "0.10", features = ["dev"] }
+digest = { version = "0.10.2", features = ["dev"] }
 hex-literal = "0.2"
 
 [features]

blake2/Cargo.toml

@@ -94,10 +94,8 @@ use digest::{
         VariableOutputCore,
     },
     crypto_common::{InvalidLength, Key, KeyInit, KeySizeUser},
-    generic_array::{
-        typenum::{IsLessOrEqual, LeEq, NonZero, Unsigned},
-        ArrayLength, GenericArray,
-    },
+    generic_array::{ArrayLength, GenericArray},
+    typenum::{IsLessOrEqual, LeEq, NonZero, Unsigned},
     FixedOutput, HashMarker, InvalidOutputSize, MacMarker, Output, Update,
 };
 #[cfg(feature = "reset")]

blake2/src/lib.rs

@@ -11,11 +11,11 @@ keywords = ["crypto", "fsb", "hash", "digest"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-digest = "0.10"
+digest = "0.10.2"
 whirlpool = { version = "0.10", path = "../whirlpool", default-features = false }
 
 [dev-dependencies]
-digest = { version = "0.10", features = ["dev"] }
+digest = { version = "0.10.2", features = ["dev"] }
 hex-literal = "0.2"
 
 [features]

fsb/Cargo.toml

@@ -43,6 +43,7 @@
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
     html_root_url = "https://docs.rs/fsb/0.1.0"
 )]
+#![forbid(unsafe_code)]
 #![warn(missing_docs, rust_2018_idioms)]
 #![allow(non_snake_case)]
 
@@ -61,7 +62,7 @@ use digest::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
         OutputSizeUser, Reset, UpdateCore,
     },
-    generic_array::{typenum::Unsigned, GenericArray},
+    typenum::Unsigned,
     HashMarker, Output,
 };
 

fsb/src/lib.rs

@@ -31,7 +31,7 @@ macro_rules! fsb_impl {
             fn update_blocks(&mut self, blocks: &[Block<Self>]) {
                 self.blocks_len += blocks.len() as u64;
                 for block in blocks {
-                    Self::compress(&mut self.state, Self::convert(block));
+                    Self::compress(&mut self.state, block);
                 }
             }
         }
@@ -42,7 +42,7 @@ macro_rules! fsb_impl {
                 let block_bytes = self.blocks_len * Self::BlockSize::U64;
                 let bit_len = 8 * (block_bytes + buffer.get_pos() as u64);
                 let mut h = self.state;
-                buffer.len64_padding_be(bit_len, |b| Self::compress(&mut h, Self::convert(b)));
+                buffer.len64_padding_be(bit_len, |b| Self::compress(&mut h, b));
 
                 let res = whirlpool::Whirlpool::digest(&h[..]);
                 let n = out.len();
@@ -111,7 +111,7 @@ macro_rules! fsb_impl {
             /// $W_i = i \times (n / w) + IV_i + M_i \times 2^{r / w}.
             fn computing_w_indices(
                 input_vector: &[u8; Self::SIZE_OUTPUT_COMPRESS],
-                message: &[u8; Self::SIZE_MSG_CHUNKS],
+                message: &Block<Self>,
             ) -> [u32; $w] {
                 let mut wind: [u32; $w] = [0; $w];
                 let divided_message: [u8; $w] = Self::dividing_bits(message, ($s - $r) / $w);
@@ -129,10 +129,7 @@ macro_rules! fsb_impl {
             /// This function servers the purpose presented in table 3, of breaking a bit array into
             /// batches of size not multiple of 8. Note that the IV will be broken always in size 8, which
             /// is quite convenient. Also, the only numbers we'll have to worry for are 5 and 6.
-            fn dividing_bits(
-                input_bits: &[u8; Self::SIZE_MSG_CHUNKS],
-                size_batches: usize,
-            ) -> [u8; $w] {
+            fn dividing_bits(input_bits: &Block<Self>, size_batches: usize) -> [u8; $w] {
                 if size_batches != 5usize && size_batches != 6usize {
                     panic!(
                         "Expecting batches of size 5 or 6. Other values do not follow \
@@ -164,10 +161,7 @@ macro_rules! fsb_impl {
             }
 
             /// This function outputs r bits, which are used to chain to the next iteration.
-            fn compress(
-                hash: &mut [u8; Self::SIZE_OUTPUT_COMPRESS],
-                message_block: &[u8; Self::SIZE_MSG_CHUNKS],
-            ) {
+            fn compress(hash: &mut [u8; Self::SIZE_OUTPUT_COMPRESS], message_block: &Block<Self>) {
                 let mut initial_vector = [0u8; Self::SIZE_OUTPUT_COMPRESS];
 
                 let w_indices = Self::computing_w_indices(hash, message_block);
@@ -284,10 +278,6 @@ macro_rules! fsb_impl {
                 }
                 truncated
             }
-
-            fn convert(block: &GenericArray<u8, $blocksize>) -> &[u8; Self::SIZE_MSG_CHUNKS] {
-                unsafe { &*(block.as_ptr() as *const [u8; Self::SIZE_MSG_CHUNKS]) }
-            }
         }
     };
 }