Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sha1: use cpufeatures to detect SHA-1 on aarch64 #268

Merged
merged 1 commit into from May 6, 2021
Merged

sha1: use cpufeatures to detect SHA-1 on aarch64 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 2 additions & 9 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions sha1/Cargo.toml
View file
Open in desktop
Expand Up @@ -21,11 +21,12 @@ opaque-debug = "0.3"
cfg-if = "1.0"
sha1-asm = { version = "0.4", optional = true }

[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
cpufeatures = "0.1"

[target.aarch64-apple-darwin.dependencies]
cpufeatures = { version = "0.1", git = "https://github.com/rustcrypto/utils.git" }
[target.'cfg(all(target_arch = "aarch64", target_os = "linux"))'.dependencies]
libc = { version = "0.2.93", optional = true }
cpufeatures = { version = "0.1", git = "https://github.com/rustcrypto/utils.git" }
[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
cpufeatures = { version = "0.1", git = "https://github.com/rustcrypto/utils.git" }

[dev-dependencies]
digest = { version = "0.9", features = ["dev"] }
Expand All @@ -34,7 +35,7 @@ hex-literal = "0.2"
[features]
default = ["std"]
std = ["digest/std"]
asm = ["sha1-asm", "libc"]
asm = ["sha1-asm"]
compress = [] # Expose compress function
force-soft = [] # Force software implementation

Expand Down
21 changes: 10 additions & 11 deletions sha1/src/compress/aarch64.rs
View file
Open in desktop
@@ -1,17 +1,16 @@
#![cfg(feature = "asm-aarch64")]
use libc::{getauxval, AT_HWCAP, HWCAP_SHA1};
//! SHA-1 `aarch64` backend.

fn sha1_supported() -> bool {
#[allow(unsafe_code)]
let hwcaps: u64 = unsafe { getauxval(AT_HWCAP) };
(hwcaps & HWCAP_SHA1) != 0
}
/// Per rustc target feature docs for `aarch64-unknown-linux-gnu` and
/// `aarch64-apple-darwin` platforms, the `sha2` target feature enables
/// SHA-1 as well:
///
/// > Enable SHA1 and SHA256 support.
cpufeatures::new!(sha2_hwcap, "sha2");

pub fn compress(state: &mut [u32; 5], blocks: &[u8; 64]) {
// TODO: Replace this platform-specific call with is_aarch64_feature_detected!("sha1") once
// that macro is stabilised and https://github.com/rust-lang/rfcs/pull/2725 is implemented
// to let us use it on no_std.
if sha1_supported() {
// TODO: Replace with https://github.com/rust-lang/rfcs/pull/2725
// after stabilization
if sha2_hwcap::get() {
for block in blocks {
sha1_asm::compress(state, block);
}
Expand Down
2 changes: 2 additions & 0 deletions sha1/src/compress/x86.rs
View file
Open in desktop
@@ -1,3 +1,5 @@
//! SHA-1 `x86`/`x86_64` backend

#![cfg(any(target_arch = "x86", target_arch = "x86_64"))]
#![allow(unsafe_code)]

Expand Down