Skip to content

Commit 5ee51e5

Browse files
committed
aes: remove force-soft feature
It's breaking cross-based builds. See: #208 (comment)
1 parent d8587e8 commit 5ee51e5

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

.github/workflows/aes.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
- run: cargo build --release --target ${{ matrix.target }}
4040
- run: cargo build --release --target ${{ matrix.target }} --features compact
4141
- run: cargo build --release --target ${{ matrix.target }} --features ctr
42-
- run: cargo build --release --target ${{ matrix.target }} --features force-soft
4342
- run: cargo build --release --target ${{ matrix.target }} --all-features
4443

4544
# Tests for the portable software backend
@@ -74,7 +73,6 @@ jobs:
7473
- run: cargo test --release --target ${{ matrix.target }}
7574
- run: cargo test --release --target ${{ matrix.target }} --features compact
7675
- run: cargo test --release --target ${{ matrix.target }} --features ctr
77-
- run: cargo test --release --target ${{ matrix.target }} --features force-soft
7876
- run: cargo test --release --target ${{ matrix.target }} --all-features
7977

8078
# Tests for the AES-NI backend
@@ -113,7 +111,6 @@ jobs:
113111
- run: cargo test --release --target ${{ matrix.target }}
114112
- run: cargo test --release --target ${{ matrix.target }} --features compact
115113
- run: cargo test --release --target ${{ matrix.target }} --features ctr
116-
- run: cargo test --release --target ${{ matrix.target }} --features force-soft
117114
- run: cargo test --release --target ${{ matrix.target }} --all-features
118115

119116
# Cross-compiled tests
@@ -147,5 +144,4 @@ jobs:
147144
- run: cross test --release --target ${{ matrix.target }}
148145
- run: cross test --release --target ${{ matrix.target }} --features compact
149146
- run: cross test --release --target ${{ matrix.target }} --features ctr
150-
- run: cargo test --release --target ${{ matrix.target }} --features force-soft
151147
- run: cargo test --release --target ${{ matrix.target }} --all-features

aes/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ cipher = { version = "=0.3.0-pre", features = ["dev"] }
2727
cpuid-bool = "0.2"
2828

2929
[features]
30-
compact = [] # Reduce code size at the cost of performance
31-
force-soft = [] # Disable support for AES hardware intrinsics
30+
compact = [] # Reduce code size at the cost of slower performance
3231

3332
[package.metadata.docs.rs]
3433
features = ["ctr"]

aes/src/lib.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@
6262
use cfg_if::cfg_if;
6363

6464
cfg_if! {
65-
if #[cfg(all(
66-
any(target_arch = "x86_64", target_arch = "x86"),
67-
not(feature = "force-soft")
68-
))] {
65+
if #[cfg(any(target_arch = "x86_64", target_arch = "x86"))] {
6966
mod autodetect;
7067
mod ni;
7168
mod soft;

0 commit comments

Comments
 (0)