Skip to content

Commit 770b494

Browse files
newpavlovnewpavlov
committed
update crates to cipher v0.4 and move block mode crates
1 parent 338c078 commit 770b494

Some content is hidden

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

103 files changed

+1266
-5772
lines changed

‎.github/workflows/cfb-mode.yml

-55
This file was deleted.

‎.github/workflows/cfb8.yml

-55
This file was deleted.

‎.github/workflows/chacha20.yml

+33-37
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
matrix:
2727
rust:
28-
- 1.51.0 # MSRV
28+
- 1.56.0 # MSRV
2929
- stable
3030
target:
3131
- thumbv7em-none-eabi
@@ -38,11 +38,8 @@ jobs:
3838
target: ${{ matrix.target }}
3939
override: true
4040
profile: minimal
41-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features cipher
42-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features hchacha
43-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features legacy
44-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features rng
45-
- run: cargo build --target ${{ matrix.target }} --release --no-default-features --features cipher,force-soft,legacy,rng,zeroize
41+
- run: cargo build --target ${{ matrix.target }}
42+
- run: cargo build --target ${{ matrix.target }} --features zeroize
4643

4744
# Tests for runtime AVX2 detection
4845
autodetect:
@@ -52,15 +49,15 @@ jobs:
5249
include:
5350
# 32-bit Linux
5451
- target: i686-unknown-linux-gnu
55-
rust: 1.51.0 # MSRV
52+
rust: 1.56.0 # MSRV
5653
deps: sudo apt update && sudo apt install gcc-multilib
5754
- target: i686-unknown-linux-gnu
5855
rust: stable
5956
deps: sudo apt update && sudo apt install gcc-multilib
6057

6158
# 64-bit Linux
6259
- target: x86_64-unknown-linux-gnu
63-
rust: 1.51.0 # MSRV
60+
rust: 1.56.0 # MSRV
6461
- target: x86_64-unknown-linux-gnu
6562
rust: stable
6663
steps:
@@ -73,31 +70,28 @@ jobs:
7370
profile: minimal
7471
- run: ${{ matrix.deps }}
7572
- run: cargo check --target ${{ matrix.target }} --all-features
76-
- run: cargo test --target ${{ matrix.target }} --release
77-
- run: cargo test --target ${{ matrix.target }} --release --features std
78-
- run: cargo test --target ${{ matrix.target }} --release --features rng
79-
- run: cargo test --target ${{ matrix.target }} --release --features zeroize
80-
- run: cargo test --target ${{ matrix.target }} --release --features std,rng,zeroize
73+
- run: cargo test --target ${{ matrix.target }}
74+
- run: cargo test --target ${{ matrix.target }} --features std,zeroize
8175

8276
# Tests for the AVX2 backend
8377
avx2:
8478
runs-on: ubuntu-latest
8579
env:
86-
RUSTFLAGS: -Ctarget-cpu=haswell -Dwarnings # Enables `avx2` target feature
80+
RUSTFLAGS: -Ctarget-feature=+avx2 -Dwarnings
8781
strategy:
8882
matrix:
8983
include:
9084
# 32-bit Linux
9185
- target: i686-unknown-linux-gnu
92-
rust: 1.51.0 # MSRV
86+
rust: 1.56.0 # MSRV
9387
deps: sudo apt update && sudo apt install gcc-multilib
9488
- target: i686-unknown-linux-gnu
9589
rust: stable
9690
deps: sudo apt update && sudo apt install gcc-multilib
9791

9892
# 64-bit Linux
9993
- target: x86_64-unknown-linux-gnu
100-
rust: 1.51.0 # MSRV
94+
rust: 1.56.0 # MSRV
10195
- target: x86_64-unknown-linux-gnu
10296
rust: stable
10397
steps:
@@ -110,30 +104,28 @@ jobs:
110104
override: true
111105
- run: ${{ matrix.deps }}
112106
- run: cargo check --target ${{ matrix.target }} --all-features
113-
- run: cargo test --target ${{ matrix.target }} --release
114-
- run: cargo test --target ${{ matrix.target }} --release --features force-soft
115-
- run: cargo test --target ${{ matrix.target }} --release --features std
116-
- run: cargo test --target ${{ matrix.target }} --release --features rng
117-
- run: cargo test --target ${{ matrix.target }} --release --features zeroize
118-
- run: cargo test --target ${{ matrix.target }} --release --all-features
107+
- run: cargo test --target ${{ matrix.target }}
108+
- run: cargo test --target ${{ matrix.target }} --features std,zeroize
119109

120110
# Tests for the portable software backend (i.e. `force-soft`)
121111
soft:
122112
runs-on: ubuntu-latest
113+
env:
114+
RUSTFLAGS: --cfg chacha20_force_soft -Dwarnings
123115
strategy:
124116
matrix:
125117
include:
126118
# 32-bit Linux
127119
- target: i686-unknown-linux-gnu
128-
rust: 1.51.0 # MSRV
120+
rust: 1.56.0 # MSRV
129121
deps: sudo apt update && sudo apt install gcc-multilib
130122
- target: i686-unknown-linux-gnu
131123
rust: stable
132124
deps: sudo apt update && sudo apt install gcc-multilib
133125

134126
# 64-bit Linux
135127
- target: x86_64-unknown-linux-gnu
136-
rust: 1.51.0 # MSRV
128+
rust: 1.56.0 # MSRV
137129
- target: x86_64-unknown-linux-gnu
138130
rust: stable
139131
steps:
@@ -146,11 +138,8 @@ jobs:
146138
override: true
147139
- run: ${{ matrix.deps }}
148140
- run: cargo check --target ${{ matrix.target }} --all-features
149-
- run: cargo test --target ${{ matrix.target }} --release --features force-soft
150-
- run: cargo test --target ${{ matrix.target }} --release --features force-soft,std
151-
- run: cargo test --target ${{ matrix.target }} --release --features force-soft,rng
152-
- run: cargo test --target ${{ matrix.target }} --release --features force-soft,rng,zeroize
153-
- run: cargo test --target ${{ matrix.target }} --release --all-features
141+
- run: cargo test --target ${{ matrix.target }}
142+
- run: cargo test --target ${{ matrix.target }} --features std,zeroize
154143

155144
# Cross-compiled tests
156145
cross:
@@ -159,7 +148,7 @@ jobs:
159148
include:
160149
# ARM64
161150
- target: aarch64-unknown-linux-gnu
162-
rust: 1.51.0 # MSRV
151+
rust: 1.56.0 # MSRV
163152
- target: aarch64-unknown-linux-gnu
164153
rust: stable
165154

@@ -170,11 +159,15 @@ jobs:
170159

171160
# PPC32
172161
- target: powerpc-unknown-linux-gnu
173-
rust: 1.51.0 # MSRV
162+
rust: 1.56.0 # MSRV
174163
- target: powerpc-unknown-linux-gnu
175164
rust: stable
176165

177166
runs-on: ubuntu-latest
167+
defaults:
168+
run:
169+
# Cross mounts only current package, i.e. by default it ignores workspace's Cargo.toml
170+
working-directory: .
178171
steps:
179172
- uses: actions/checkout@v1
180173
- run: ${{ matrix.deps }}
@@ -184,9 +177,12 @@ jobs:
184177
target: ${{ matrix.target }}
185178
profile: minimal
186179
override: true
187-
- run: cargo install cross
188-
- run: cross test --target ${{ matrix.target }} --release ${{ matrix.features }}
189-
- run: cross test --target ${{ matrix.target }} --release --features force-soft
190-
- run: cross test --target ${{ matrix.target }} --release --features rng
191-
- run: cross test --target ${{ matrix.target }} --release --features std
192-
- run: cross test --target ${{ matrix.target }} --release --all-features
180+
- name: Install precompiled cross
181+
run: |
182+
export URL=$(curl -s https://api.github.com/repos/cross-rs/cross/releases/latest | \
183+
jq -r '.assets[] | select(.name | contains("x86_64-unknown-linux-gnu.tar.gz")) | .browser_download_url')
184+
wget -O /tmp/binaries.tar.gz $URL
185+
tar -C /tmp -xzf /tmp/binaries.tar.gz
186+
mv /tmp/cross ~/.cargo/bin
187+
shell: bash
188+
- run: cross test --package chacha20 --target ${{ matrix.target }} ${{ matrix.features }}

‎.github/workflows/ctr.yml

-55
This file was deleted.

‎.github/workflows/hc-256.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
rust:
25-
- 1.41.0 # MSRV
25+
- 1.56.0 # MSRV
2626
- stable
2727
target:
2828
- thumbv7em-none-eabi
@@ -35,15 +35,15 @@ jobs:
3535
toolchain: ${{ matrix.rust }}
3636
target: ${{ matrix.target }}
3737
override: true
38-
- run: cargo build --release --target ${{ matrix.target }}
39-
- run: cargo build --release --target ${{ matrix.target }} --features zeroize
38+
- run: cargo build --target ${{ matrix.target }}
39+
- run: cargo build --target ${{ matrix.target }} --features zeroize
4040

4141
test:
4242
runs-on: ubuntu-latest
4343
strategy:
4444
matrix:
4545
rust:
46-
- 1.41.0 # MSRV
46+
- 1.56.0 # MSRV
4747
- stable
4848
steps:
4949
- uses: actions/checkout@v1
@@ -53,4 +53,4 @@ jobs:
5353
toolchain: ${{ matrix.rust }}
5454
override: true
5555
- run: cargo test
56-
- run: cargo test --release
56+
- run: cargo test --all-features

0 commit comments

Comments
 (0)