Skip to content

Commit 4863452

Browse files
eternal-flame-ADeternal-flame-AD
committed
Merge branch 'master' into scrypt-sse2
2 parents 46d6a01 + c30aea6 commit 4863452

Some content is hidden

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

43 files changed

+630
-505
lines changed

‎.github/workflows/argon2.yml‎

Lines changed: 4 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:
@@ -65,7 +65,7 @@ jobs:
6565
- target: x86_64-unknown-linux-gnu
6666
rust: stable
6767
steps:
68-
- uses: actions/checkout@v5
68+
- uses: actions/checkout@v6
6969
- uses: RustCrypto/actions/cargo-cache@master
7070
- uses: dtolnay/rust-toolchain@master
7171
with:
@@ -80,7 +80,7 @@ jobs:
8080
careful:
8181
runs-on: ubuntu-latest
8282
steps:
83-
- uses: actions/checkout@v5
83+
- uses: actions/checkout@v6
8484
- uses: dtolnay/rust-toolchain@nightly
8585
- run: cargo install cargo-careful
8686
- run: cargo careful test --all-features
@@ -98,7 +98,7 @@ jobs:
9898
rust: stable
9999
runs-on: ubuntu-latest
100100
steps:
101-
- uses: actions/checkout@v5
101+
- uses: actions/checkout@v6
102102
- run: ${{ matrix.deps }}
103103
- uses: dtolnay/rust-toolchain@master
104104
with:

‎.github/workflows/balloon-hash.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -52,7 +52,7 @@ jobs:
5252
- 1.85.0 # MSRV
5353
- stable
5454
steps:
55-
- uses: actions/checkout@v5
55+
- uses: actions/checkout@v6
5656
- uses: RustCrypto/actions/cargo-cache@master
5757
- uses: dtolnay/rust-toolchain@master
5858
with:

‎.github/workflows/bcrypt-pbkdf.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -51,7 +51,7 @@ jobs:
5151
- 1.85.0 # MSRV
5252
- stable
5353
steps:
54-
- uses: actions/checkout@v5
54+
- uses: actions/checkout@v6
5555
- uses: RustCrypto/actions/cargo-cache@master
5656
- uses: dtolnay/rust-toolchain@master
5757
with:

‎.github/workflows/fuzz_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
if: false # disabled while using pre-releases
2525
steps:
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@v6
2727
- uses: RustCrypto/actions/cargo-cache@master
2828
- uses: dtolnay/rust-toolchain@master
2929
with:

‎.github/workflows/password-auth.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- 1.85.0 # MSRV
3030
- stable
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:
@@ -50,7 +50,7 @@ jobs:
5050
- 1.85.0 # MSRV
5151
- stable
5252
steps:
53-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5454
- uses: RustCrypto/actions/cargo-cache@master
5555
- uses: dtolnay/rust-toolchain@master
5656
with:

‎.github/workflows/pbkdf2.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,19 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
3535
toolchain: ${{ matrix.rust }}
3636
targets: ${{ matrix.target }}
3737
- run: cargo build --target ${{ matrix.target }} --no-default-features
38-
- run: cargo build --target ${{ matrix.target }} --no-default-features --features simple
3938

4039
minimal-versions:
4140
if: false # disabled while using pre-releases
4241
uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4342
with:
44-
working-directory: ${{ github.workflow }}
43+
working-directory: ${{ github.workflow }}
4544

4645
test:
4746
runs-on: ubuntu-latest
@@ -51,7 +50,7 @@ jobs:
5150
- 1.85.0 # MSRV
5251
- stable
5352
steps:
54-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5554
- uses: RustCrypto/actions/cargo-cache@master
5655
- uses: dtolnay/rust-toolchain@master
5756
with:

‎.github/workflows/readme.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
test:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626
- uses: RustCrypto/actions/cargo-cache@master
2727
- uses: dtolnay/rust-toolchain@master
2828
with:

‎.github/workflows/scrypt.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -52,7 +52,7 @@ jobs:
5252
- 1.85.0 # MSRV
5353
- stable
5454
steps:
55-
- uses: actions/checkout@v5
55+
- uses: actions/checkout@v6
5656
- uses: RustCrypto/actions/cargo-cache@master
5757
- uses: dtolnay/rust-toolchain@master
5858
with:

‎.github/workflows/security-audit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Security Audit
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
- uses: RustCrypto/actions/cargo-cache@master
2222
- uses: dtolnay/rust-toolchain@master
2323
with:

‎.github/workflows/sha-crypt.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- thumbv7em-none-eabi
2929
- wasm32-unknown-unknown
3030
steps:
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232
- uses: RustCrypto/actions/cargo-cache@master
3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -50,7 +50,7 @@ jobs:
5050
- 1.85.0 # MSRV
5151
- stable
5252
steps:
53-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5454
- uses: RustCrypto/actions/cargo-cache@master
5555
- uses: dtolnay/rust-toolchain@master
5656
with:

0 commit comments

Comments
 (0)