sha1+sha2: make aarch64 CPU feature detection OS-independent (#276)

tarcieri · web-flow · commit 1de4114adb78 · 2021-05-15T12:29:22.000-07:00
`cpufeatures` v0.1.4 can build on any `aarch64` target, not just Linux/macOS ones: RustCrypto/utils#40 This PR bumps the minimum `cpufeatures` requirement to v0.1.4 and removes the OS-specifisms on `aarch64` targets.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sha1/Cargo.toml b/sha1/Cargo.toml
@@ -21,12 +21,8 @@ opaque-debug = "0.3"
 cfg-if = "1.0"
 sha1-asm = { version = "0.4", optional = true }
 
-[target.aarch64-apple-darwin.dependencies]
-cpufeatures = "0.1.3"
-[target.'cfg(all(target_arch = "aarch64", target_os = "linux"))'.dependencies]
-cpufeatures = "0.1.3"
-[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
-cpufeatures = "0.1.3"
+[target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies]
+cpufeatures = "0.1.4"
 
 [dev-dependencies]
 digest = { version = "0.9", features = ["dev"] }
diff --git a/sha1/src/compress.rs b/sha1/src/compress.rs
@@ -5,7 +5,7 @@ cfg_if::cfg_if! {
     if #[cfg(feature = "force-soft")] {
         mod soft;
         use soft::compress as compress_inner;
-    } else if #[cfg(all(feature = "asm", target_arch = "aarch64", target_os = "linux"))] {
+    } else if #[cfg(all(feature = "asm", target_arch = "aarch64"))] {
         mod soft;
         mod aarch64;
         use aarch64::compress as compress_inner;
diff --git a/sha2/Cargo.toml b/sha2/Cargo.toml
@@ -21,12 +21,8 @@ opaque-debug = "0.3"
 cfg-if = "1.0"
 sha2-asm = { version = "0.6.1", optional = true }
 
-[target.aarch64-apple-darwin.dependencies]
-cpufeatures = "0.1.3"
-[target.'cfg(all(target_arch = "aarch64", target_os = "linux"))'.dependencies]
-cpufeatures = "0.1.3"
-[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
-cpufeatures = "0.1.3"
+[target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies]
+cpufeatures = "0.1.4"
 
 [dev-dependencies]
 digest = { version = "0.9", features = ["dev"] }
diff --git a/sha2/src/sha256.rs b/sha2/src/sha256.rs
@@ -153,7 +153,7 @@ cfg_if::cfg_if! {
         }
         mod x86;
         use x86::compress;
-    } else if #[cfg(all(feature = "asm", target_arch = "aarch64", any(target_os = "macos", target_os = "linux")))] {
+    } else if #[cfg(all(feature = "asm", target_arch = "aarch64"))] {
         mod soft;
         mod aarch64;
         use aarch64::compress;

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ cfg_if::cfg_if! {`
`153`	`153`	`}`
`154`	`154`	`mod x86;`
`155`	`155`	`use x86::compress;`
`156`		`- } else if #[cfg(all(feature = "asm", target_arch = "aarch64", any(target_os = "macos", target_os = "linux")))] {`
	`156`	`+ } else if #[cfg(all(feature = "asm", target_arch = "aarch64"))] {`
`157`	`157`	`mod soft;`
`158`	`158`	`mod aarch64;`
`159`	`159`	`use aarch64::compress;`