Skip to content

Commit 28e3d89

Browse files
committed
aes: remove use of aarch64_target_feature
It's been stabilized: rust-lang/rust#90620 Because of that, it's breaking the build on recent nightlies: https://github.com/RustCrypto/block-ciphers/runs/7968517726?check_suite_focus=true#step:7:103 > error: the feature `aarch64_target_feature` has been stable since > 1.61.0 and no longer requires an attribute to enable aes: remove use of `aarch64_target_feature` It's been stabilized: rust-lang/rust#90620 Because of that, it's breaking the build on recent nightlies: https://github.com/RustCrypto/block-ciphers/runs/7968517726?check_suite_focus=true#step:7:103 > error: the feature `aarch64_target_feature` has been stable since > 1.61.0 and no longer requires an attribute to enable
1 parent 04c5d46 commit 28e3d89

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

aes/Cargo.toml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,23 @@ categories = ["cryptography", "no-std"]
1515
[dependencies]
1616
cfg-if = "1"
1717
cipher = "0.4.2"
18-
zeroize = { version = "1.5.6", optional = true, default_features = false }
1918

2019
[target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies]
2120
cpufeatures = "0.2"
2221

22+
[target.'cfg(not(all(aes_armv8, target_arch = "aarch64")))'.dependencies]
23+
zeroize = { version = "1.5.6", optional = true, default_features = false }
24+
25+
# TODO(tarcieri): unconditionally enable `aarch64` feature when MSRV is 1.59
26+
[target.'cfg(all(aes_armv8, target_arch = "aarch64"))'.dependencies]
27+
zeroize = { version = "1.5.6", optional = true, default_features = false, features = ["aarch64"] }
28+
2329
[dev-dependencies]
2430
cipher = { version = "0.4.2", features = ["dev"] }
2531
hex-literal = "0.3"
2632

2733
[features]
28-
hazmat = [] # Expose cryptographically hazardous APIs
34+
hazmat = [] # Expose cryptographically hazardous APIs
2935

3036
[package.metadata.docs.rs]
3137
all-features = true

aes/src/lib.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,10 @@
120120
)]
121121
#![cfg_attr(docsrs, feature(doc_cfg))]
122122
#![warn(missing_docs, rust_2018_idioms)]
123-
#![cfg_attr(
124-
all(aes_armv8, target_arch = "aarch64"),
125-
feature(stdsimd, aarch64_target_feature)
126-
)]
123+
#![cfg_attr(all(aes_armv8, target_arch = "aarch64"), feature(stdsimd))]
127124

128125
#[cfg(feature = "hazmat")]
126+
#[cfg_attr(docsrs, doc(cfg(feature = "hazmat")))]
129127
pub mod hazmat;
130128

131129
mod soft;

0 commit comments

Comments
 (0)