Skip to content

Commit 90b3da9

Browse files
committed
Merge branch 'master' of github.com:RustCrypto/MACs into kmac-submission
2 parents 25f33f2 + 504ec1a commit 90b3da9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+468
-315
lines changed

.clippy.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
allow-unwrap-in-consts = true
2+
allow-unwrap-in-tests = true

.github/workflows/belt-mac.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- thumbv7em-none-eabi
3030
- wasm32-unknown-unknown
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- uses: RustCrypto/actions/cargo-cache@master
3434
- uses: dtolnay/rust-toolchain@master
3535
with:
@@ -38,8 +38,6 @@ jobs:
3838
- run: cargo build --no-default-features --target ${{ matrix.target }}
3939

4040
minimal-versions:
41-
# disabled until belt-block gets published
42-
if: false
4341
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4442
with:
4543
working-directory: ${{ github.workflow }}
@@ -52,7 +50,7 @@ jobs:
5250
- 1.85.0 # MSRV
5351
- stable
5452
steps:
55-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5654
- uses: RustCrypto/actions/cargo-cache@master
5755
- uses: dtolnay/rust-toolchain@master
5856
with:

.github/workflows/cbc-mac.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- thumbv7em-none-eabi
3131
- wasm32-unknown-unknown
3232
steps:
33-
- uses: actions/checkout@v5
33+
- uses: actions/checkout@v6
3434
- uses: RustCrypto/actions/cargo-cache@master
3535
- uses: dtolnay/rust-toolchain@master
3636
with:
@@ -39,8 +39,6 @@ jobs:
3939
- run: cargo build --no-default-features --target ${{ matrix.target }}
4040

4141
minimal-versions:
42-
# disabled until belt-block gets published
43-
if: false
4442
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4543
with:
4644
working-directory: ${{ github.workflow }}
@@ -53,7 +51,7 @@ jobs:
5351
- 1.85.0 # MSRV
5452
- stable
5553
steps:
56-
- uses: actions/checkout@v5
54+
- uses: actions/checkout@v6
5755
- uses: RustCrypto/actions/cargo-cache@master
5856
- uses: dtolnay/rust-toolchain@master
5957
with:

.github/workflows/cmac.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- thumbv7em-none-eabi
3030
- wasm32-unknown-unknown
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- uses: RustCrypto/actions/cargo-cache@master
3434
- uses: dtolnay/rust-toolchain@master
3535
with:
@@ -38,8 +38,6 @@ jobs:
3838
- run: cargo build --no-default-features --target ${{ matrix.target }}
3939

4040
minimal-versions:
41-
# disabled until belt-block gets published
42-
if: false
4341
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4442
with:
4543
working-directory: ${{ github.workflow }}
@@ -52,7 +50,7 @@ jobs:
5250
- 1.85.0 # MSRV
5351
- stable
5452
steps:
55-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5654
- uses: RustCrypto/actions/cargo-cache@master
5755
- uses: dtolnay/rust-toolchain@master
5856
with:

.github/workflows/hmac.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- thumbv7em-none-eabi
3131
- wasm32-unknown-unknown
3232
steps:
33-
- uses: actions/checkout@v5
33+
- uses: actions/checkout@v6
3434
- uses: RustCrypto/actions/cargo-cache@master
3535
- uses: dtolnay/rust-toolchain@master
3636
with:
@@ -39,7 +39,6 @@ jobs:
3939
- run: cargo build --no-default-features --target ${{ matrix.target }}
4040

4141
minimal-versions:
42-
if: false # TODO: temp disabled due to unpublished prerelease dependencies
4342
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4443
with:
4544
working-directory: ${{ github.workflow }}
@@ -52,7 +51,7 @@ jobs:
5251
- 1.85.0 # MSRV
5352
- stable
5453
steps:
55-
- uses: actions/checkout@v5
54+
- uses: actions/checkout@v6
5655
- uses: RustCrypto/actions/cargo-cache@master
5756
- uses: dtolnay/rust-toolchain@master
5857
with:

.github/workflows/pmac.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- thumbv7em-none-eabi
3030
- wasm32-unknown-unknown
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- uses: RustCrypto/actions/cargo-cache@master
3434
- uses: dtolnay/rust-toolchain@master
3535
with:
@@ -38,8 +38,6 @@ jobs:
3838
- run: cargo build --no-default-features --target ${{ matrix.target }}
3939

4040
minimal-versions:
41-
# disabled until belt-block gets published
42-
if: false
4341
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4442
with:
4543
working-directory: ${{ github.workflow }}
@@ -52,7 +50,7 @@ jobs:
5250
- 1.85.0 # MSRV
5351
- stable
5452
steps:
55-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5654
- uses: RustCrypto/actions/cargo-cache@master
5755
- uses: dtolnay/rust-toolchain@master
5856
with:

.github/workflows/publish.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Publish to crates.io
2+
on:
3+
push:
4+
tags: [
5+
'belt-mac-v*',
6+
'cbc-mac-v*',
7+
'cmac-v*',
8+
'hmac-v*',
9+
'pmac-v*',
10+
'retail-mac-v*',
11+
]
12+
13+
jobs:
14+
publish:
15+
runs-on: ubuntu-latest
16+
environment: publish
17+
permissions:
18+
id-token: write
19+
steps:
20+
- uses: actions/checkout@v6
21+
- uses: rust-lang/crates-io-auth-action@v1
22+
id: auth
23+
24+
- name: Extract Crate Name and Version
25+
run: |
26+
TAG_NAME="${{ github.ref_name }}"
27+
CRATE_NAME=${TAG_NAME%-v*}
28+
CRATE_VERSION=${TAG_NAME##*-v}
29+
echo $CRATE_NAME $CRATE_VERSION
30+
echo "CRATE_NAME=${CRATE_NAME}" >> $GITHUB_ENV
31+
echo "CRATE_VERSION=${CRATE_VERSION}" >> $GITHUB_ENV
32+
33+
- name: Check crate version
34+
working-directory: ${{ env.CRATE_NAME }}
35+
run: |
36+
CRATE_TOML_VERSION=$(grep "^version =" Cargo.toml | cut -d'"' -f2)
37+
echo $CRATE_TOML_VERSION
38+
[[ $CRATE_TOML_VERSION == $CRATE_VERSION ]]
39+
40+
- name: Publish
41+
working-directory: ${{ env.CRATE_NAME }}
42+
env:
43+
CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}
44+
run: cargo publish

.github/workflows/retail-mac.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- thumbv7em-none-eabi
3030
- wasm32-unknown-unknown
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- uses: RustCrypto/actions/cargo-cache@master
3434
- uses: dtolnay/rust-toolchain@master
3535
with:
@@ -38,8 +38,6 @@ jobs:
3838
- run: cargo build --no-default-features --target ${{ matrix.target }}
3939

4040
minimal-versions:
41-
# disabled until belt-block gets published
42-
if: false
4341
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4442
with:
4543
working-directory: ${{ github.workflow }}
@@ -52,7 +50,7 @@ jobs:
5250
- 1.85.0 # MSRV
5351
- stable
5452
steps:
55-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5654
- uses: RustCrypto/actions/cargo-cache@master
5755
- uses: dtolnay/rust-toolchain@master
5856
with:

.github/workflows/workspace.yml

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,50 @@ on:
66
- README.md
77
push:
88
branches: master
9-
paths-ignore:
10-
- README.md
119

1210
jobs:
1311
clippy:
1412
runs-on: ubuntu-latest
1513
steps:
16-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1715
- uses: RustCrypto/actions/cargo-cache@master
1816
- uses: dtolnay/rust-toolchain@master
1917
with:
20-
toolchain: 1.85.0
18+
toolchain: 1.93.0
2119
components: clippy
22-
- run: cargo clippy --all -- -D warnings
20+
- run: cargo clippy --workspace --all-features --lib --bins --tests -- -D warnings
2321

24-
rustfmt:
22+
doc:
2523
runs-on: ubuntu-latest
2624
steps:
27-
- name: Checkout sources
28-
uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
26+
- uses: dtolnay/rust-toolchain@master
27+
with:
28+
toolchain: stable
29+
- env:
30+
RUSTDOCFLAGS: "-Dwarnings"
31+
run: cargo doc --workspace --all-features
2932

30-
- name: Install stable toolchain
31-
uses: dtolnay/rust-toolchain@master
33+
rustfmt:
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v6
37+
- uses: dtolnay/rust-toolchain@master
3238
with:
3339
toolchain: stable
3440
components: rustfmt
35-
36-
- name: Run cargo fmt
37-
run: cargo fmt --all -- --check
41+
- run: cargo fmt --all -- --check
3842

3943
typos:
4044
runs-on: ubuntu-latest
4145
steps:
42-
- uses: actions/checkout@v5
46+
- uses: actions/checkout@v6
4347
- uses: crate-ci/typos@v1
48+
49+
lock:
50+
name: Check Cargo.lock
51+
runs-on: ubuntu-latest
52+
steps:
53+
- uses: actions/checkout@v6
54+
- uses: dtolnay/rust-toolchain@stable
55+
- run: cargo check --workspace --locked

0 commit comments

Comments
 (0)