diff --git a/.github/workflows/blake2.yml b/.github/workflows/blake2.yml index 6aed43dc6..51f49050a 100644 --- a/.github/workflows/blake2.yml +++ b/.github/workflows/blake2.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest diff --git a/.github/workflows/fsb.yml b/.github/workflows/fsb.yml index 737f53401..3a1b1a51d 100644 --- a/.github/workflows/fsb.yml +++ b/.github/workflows/fsb.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest diff --git a/.github/workflows/gost94.yml b/.github/workflows/gost94.yml index 10cbaee42..99c2a8feb 100644 --- a/.github/workflows/gost94.yml +++ b/.github/workflows/gost94.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest @@ -55,4 +55,3 @@ jobs: - run: cargo test --no-default-features - run: cargo test - run: cargo test --all-features - diff --git a/.github/workflows/groestl.yml b/.github/workflows/groestl.yml index 411d866d3..481e69718 100644 --- a/.github/workflows/groestl.yml +++ b/.github/workflows/groestl.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest diff --git a/.github/workflows/k12.yml b/.github/workflows/k12.yml index 7e993c8a5..5899fa6fd 100644 --- a/.github/workflows/k12.yml +++ b/.github/workflows/k12.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest @@ -55,4 +55,3 @@ jobs: - run: cargo test --no-default-features - run: cargo test - run: cargo test --all-features - diff --git a/.github/workflows/md2.yml b/.github/workflows/md2.yml index f9b090009..26a2cf675 100644 --- a/.github/workflows/md2.yml +++ b/.github/workflows/md2.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest @@ -55,4 +55,3 @@ jobs: - run: cargo test --no-default-features - run: cargo test - run: cargo test --all-features - diff --git a/.github/workflows/md4.yml b/.github/workflows/md4.yml index 9c4bde676..84a15538f 100644 --- a/.github/workflows/md4.yml +++ b/.github/workflows/md4.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest @@ -55,4 +55,3 @@ jobs: - run: cargo test --no-default-features - run: cargo test - run: cargo test --all-features - diff --git a/.github/workflows/md5.yml b/.github/workflows/md5.yml index 0fbfa4dff..86cab99c2 100644 --- a/.github/workflows/md5.yml +++ b/.github/workflows/md5.yml @@ -38,7 +38,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest diff --git a/.github/workflows/ripemd.yml b/.github/workflows/ripemd.yml index cf0ee5ff6..4168cc285 100644 --- a/.github/workflows/ripemd.yml +++ b/.github/workflows/ripemd.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest @@ -55,4 +55,3 @@ jobs: - run: cargo test --no-default-features - run: cargo test - run: cargo test --all-features - diff --git a/.github/workflows/sha1.yml b/.github/workflows/sha1.yml index 803cc99bf..2b5960946 100644 --- a/.github/workflows/sha1.yml +++ b/.github/workflows/sha1.yml @@ -36,7 +36,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} # Linux tests linux: @@ -69,10 +69,10 @@ jobs: target: ${{ matrix.target }} override: true - run: ${{ matrix.deps }} - - run: cargo test --target ${{ matrix.target }} --release --no-default-features - - run: cargo test --target ${{ matrix.target }} --release - - run: cargo test --target ${{ matrix.target }} --release --features asm - - run: cargo test --target ${{ matrix.target }} --release --all-features + - run: cargo test --target ${{ matrix.target }} --no-default-features + - run: cargo test --target ${{ matrix.target }} + - run: cargo test --target ${{ matrix.target }} --features asm + - run: cargo test --target ${{ matrix.target }} --all-features # macOS tests macos: @@ -91,10 +91,10 @@ jobs: toolchain: ${{ matrix.toolchain }} target: x86_64-apple-darwin override: true - - run: cargo test --release --no-default-features - - run: cargo test --release - - run: cargo test --release --features asm - - run: cargo test --release --all-features + - run: cargo test --no-default-features + - run: cargo test + - run: cargo test --features asm + - run: cargo test --all-features # Windows tests windows: @@ -118,7 +118,7 @@ jobs: target: ${{ matrix.target }} override: true - uses: msys2/setup-msys2@v2 - - run: cargo test --target ${{ matrix.target }} --release + - run: cargo test --target ${{ matrix.target }} # Cross-compiled tests # *** NOTE: Currently broken with `asm` feature enabled! See: @@ -144,5 +144,5 @@ jobs: # target: ${{ matrix.target }} # override: true # - run: cargo install cross - # - run: cross test --target ${{ matrix.target }} --release - # - run: cross test --target ${{ matrix.target }} --release --features asm + # - run: cross test --target ${{ matrix.target }} + # - run: cross test --target ${{ matrix.target }} --features asm diff --git a/.github/workflows/sha2.yml b/.github/workflows/sha2.yml index 0e2e34d70..6b2227292 100644 --- a/.github/workflows/sha2.yml +++ b/.github/workflows/sha2.yml @@ -36,7 +36,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} # Linux tests linux: @@ -67,10 +67,10 @@ jobs: target: ${{ matrix.target }} override: true - run: ${{ matrix.deps }} - - run: cargo test --target ${{ matrix.target }} --release --no-default-features - - run: cargo test --target ${{ matrix.target }} --release - - run: cargo test --target ${{ matrix.target }} --release --features asm - - run: cargo test --target ${{ matrix.target }} --release --all-features + - run: cargo test --target ${{ matrix.target }} --no-default-features + - run: cargo test --target ${{ matrix.target }} + - run: cargo test --target ${{ matrix.target }} --features asm + - run: cargo test --target ${{ matrix.target }} --all-features # macOS tests macos: @@ -89,9 +89,9 @@ jobs: toolchain: ${{ matrix.toolchain }} target: x86_64-apple-darwin override: true - - run: cargo test --release --no-default-features - - run: cargo test --release - - run: cargo test --release --features asm + - run: cargo test --no-default-features + - run: cargo test + - run: cargo test --features asm # Windows tests windows: @@ -115,7 +115,7 @@ jobs: target: ${{ matrix.target }} override: true - uses: msys2/setup-msys2@v2 - - run: cargo test --target ${{ matrix.target }} --release + - run: cargo test --target ${{ matrix.target }} # Cross-compiled tests cross: @@ -147,5 +147,5 @@ jobs: wget -O /tmp/binaries.tar.gz $URL tar -C /tmp -xzf /tmp/binaries.tar.gz mv /tmp/cross ~/.cargo/bin - - run: cross test --package sha2 --target ${{ matrix.target }} --release - - run: cross test --package sha2 --target ${{ matrix.target }} --release --features asm + - run: cross test --package sha2 --target ${{ matrix.target }} + - run: cross test --package sha2 --target ${{ matrix.target }} --features asm diff --git a/.github/workflows/sha3.yml b/.github/workflows/sha3.yml index 94abb4a30..6e9c9dd1d 100644 --- a/.github/workflows/sha3.yml +++ b/.github/workflows/sha3.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest diff --git a/.github/workflows/shabal.yml b/.github/workflows/shabal.yml index f9d198b37..dfb7f5867 100644 --- a/.github/workflows/shabal.yml +++ b/.github/workflows/shabal.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest diff --git a/.github/workflows/sm3.yml b/.github/workflows/sm3.yml index e954778f6..8f353134f 100644 --- a/.github/workflows/sm3.yml +++ b/.github/workflows/sm3.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest @@ -55,4 +55,3 @@ jobs: - run: cargo test --no-default-features - run: cargo test - run: cargo test --all-features - diff --git a/.github/workflows/streebog.yml b/.github/workflows/streebog.yml index b523c45ba..46f00fd50 100644 --- a/.github/workflows/streebog.yml +++ b/.github/workflows/streebog.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest @@ -55,4 +55,3 @@ jobs: - run: cargo test --no-default-features - run: cargo test - run: cargo test --all-features - diff --git a/.github/workflows/tiger.yml b/.github/workflows/tiger.yml index 8e1e6ff59..273078bf8 100644 --- a/.github/workflows/tiger.yml +++ b/.github/workflows/tiger.yml @@ -38,7 +38,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest diff --git a/.github/workflows/whirlpool.yml b/.github/workflows/whirlpool.yml index 42c2b4704..fd506d74c 100644 --- a/.github/workflows/whirlpool.yml +++ b/.github/workflows/whirlpool.yml @@ -35,7 +35,7 @@ jobs: toolchain: ${{ matrix.rust }} target: ${{ matrix.target }} override: true - - run: cargo build --no-default-features --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --target ${{ matrix.target }} test: runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index efff1dbb1..299f76dcf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,14 +12,15 @@ dependencies = [ [[package]] name = "blobby" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc52553543ecb104069b0ff9e0fcc5c739ad16202935528a112d974e8f1a4ee8" +checksum = "847495c209977a90e8aad588b959d0ca9f5dc228096d29a6bd3defd53f35eaec" [[package]] name = "block-buffer" version = "0.10.0" -source = "git+https://github.com/RustCrypto/utils?branch=block-buffer/v0.10#c47a851d747fa79df02567ab4d9faf40a1093855" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" dependencies = [ "generic-array", ] @@ -48,7 +49,8 @@ dependencies = [ [[package]] name = "crypto-common" version = "0.1.0" -source = "git+https://github.com/RustCrypto/traits/?branch=digest/v0.10#9f516a7feb02fe27f535a91e903deac2f224e974" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f" dependencies = [ "generic-array", ] @@ -56,7 +58,8 @@ dependencies = [ [[package]] name = "digest" version = "0.10.0" -source = "git+https://github.com/RustCrypto/traits/?branch=digest/v0.10#9f516a7feb02fe27f535a91e903deac2f224e974" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d" dependencies = [ "blobby", "block-buffer", @@ -135,9 +138,9 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "libc" -version = "0.2.108" +version = "0.2.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" +checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01" [[package]] name = "md-5" diff --git a/Cargo.toml b/Cargo.toml index 91c900778..acf46a65c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,3 @@ members = [ [profile.dev] opt-level = 2 - -[patch.crates-io] -digest = { git = "https://github.com/RustCrypto/traits/", branch = "digest/v0.10" } -block-buffer = { git = "https://github.com/RustCrypto/utils", branch = "block-buffer/v0.10" }