Skip to content

Commit 7e1b366

Browse files
tlerchertlercher
authored
sha1: Add extra .S for AArch64 on macOS (Fixing building on M1 Macs) (#38)
1 parent 176e990 commit 7e1b366

File tree

4 files changed

+243
-3
lines changed

4 files changed

+243
-3
lines changed

‎sha1/build.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
fn main() {
22
let target_arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default();
3+
let target_vendor = std::env::var("CARGO_CFG_TARGET_VENDOR").unwrap_or_default();
34

45
let asm_path = if target_arch == "x86" {
56
"src/x86.S"
67
} else if target_arch == "x86_64" {
78
"src/x64.S"
9+
} else if target_arch == "aarch64" && target_vendor == "apple" {
10+
"src/aarch64_apple.S"
811
} else if target_arch == "aarch64" {
912
"src/aarch64.S"
1013
} else {

‎sha1/src/aarch64_apple.S

Lines changed: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
/*
2+
* SHA-1 hash in AArch64 assembly
3+
*
4+
* Copyright (c) 2020 Emmanuel Gil Peyrot <[email protected]>. (MIT License)
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy of
7+
* this software and associated documentation files (the "Software"), to deal in
8+
* the Software without restriction, including without limitation the rights to
9+
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
10+
* the Software, and to permit persons to whom the Software is furnished to do so,
11+
* subject to the following conditions:
12+
* - The above copyright notice and this permission notice shall be included in
13+
* all copies or substantial portions of the Software.
14+
* - The Software is provided "as is", without warranty of any kind, express or
15+
* implied, including but not limited to the warranties of merchantability,
16+
* fitness for a particular purpose and noninfringement. In no event shall the
17+
* authors or copyright holders be liable for any claim, damages or other
18+
* liability, whether in an action of contract, tort or otherwise, arising from,
19+
* out of or in connection with the Software or the use or other dealings in the
20+
* Software.
21+
*/
22+
23+
24+
/* void sha1_compress(uint32_t state[5], const uint8_t block[64]) */
25+
.global _sha1_compress
26+
_sha1_compress:
27+
/*
28+
* Storage usage:
29+
* Bytes Location Description
30+
* 4 x0 state argument
31+
* 4 x1 block argument
32+
* 16 q0 W0
33+
* 16 q1 W1
34+
* 16 q2 W2
35+
* 16 q3 W3
36+
* 16 q4 k
37+
* 16 q5 Original ABCD
38+
* 16 q6 ABCD (with s3 being A)
39+
* 4 s16 E
40+
* 4 s17 e0
41+
* 4 s18 e1
42+
* 16 q19 wk
43+
*/
44+
45+
// Load state in registers
46+
ldr q5, [x0]
47+
ldr s16, [x0, 16]
48+
mov v6.16b, v5.16b
49+
50+
// Load block in registers
51+
ldr q0, [x1]
52+
ldr q1, [x1, 16]
53+
ldr q2, [x1, 32]
54+
ldr q3, [x1, 48]
55+
56+
// TODO: only do that on little endian
57+
rev32 v0.16b, v0.16b
58+
rev32 v1.16b, v1.16b
59+
rev32 v2.16b, v2.16b
60+
rev32 v3.16b, v3.16b
61+
62+
// k for the next five rounds
63+
adrp x1, .K0@PAGE
64+
ldr q4, [x1, #:lo12:.K0@PAGEOFF]
65+
66+
// 0
67+
sha1h s18, s6
68+
add v19.4s, v0.4s, v4.4s
69+
sha1c q6, s16, v19.4s
70+
sha1su0 v0.4s, v1.4s, v2.4s
71+
72+
// 1
73+
sha1h s17, s6
74+
add v19.4s, v1.4s, v4.4s
75+
sha1c q6, s18, v19.4s
76+
sha1su1 v0.4s, v3.4s
77+
sha1su0 v1.4s, v2.4s, v3.4s
78+
79+
// 2
80+
sha1h s18, s6
81+
add v19.4s, v2.4s, v4.4s
82+
sha1c q6, s17, v19.4s
83+
sha1su1 v1.4s, v0.4s
84+
sha1su0 v2.4s, v3.4s, v0.4s
85+
86+
// 3
87+
sha1h s17, s6
88+
add v19.4s, v3.4s, v4.4s
89+
sha1c q6, s18, v19.4s
90+
sha1su1 v2.4s, v1.4s
91+
sha1su0 v3.4s, v0.4s, v1.4s
92+
93+
// 4
94+
sha1h s18, s6
95+
add v19.4s, v0.4s, v4.4s
96+
sha1c q6, s17, v19.4s
97+
sha1su1 v3.4s, v2.4s
98+
sha1su0 v0.4s, v1.4s, v2.4s
99+
100+
// k for the next five rounds
101+
adrp x1, .K1@PAGE
102+
ldr q4, [x1, #:lo12:.K1@PAGEOFF]
103+
104+
// 5
105+
sha1h s17, s6
106+
add v19.4s, v1.4s, v4.4s
107+
sha1p q6, s18, v19.4s
108+
sha1su1 v0.4s, v3.4s
109+
sha1su0 v1.4s, v2.4s, v3.4s
110+
111+
// 6
112+
sha1h s18, s6
113+
add v19.4s, v2.4s, v4.4s
114+
sha1p q6, s17, v19.4s
115+
sha1su1 v1.4s, v0.4s
116+
sha1su0 v2.4s, v3.4s, v0.4s
117+
118+
// 7
119+
sha1h s17, s6
120+
add v19.4s, v3.4s, v4.4s
121+
sha1p q6, s18, v19.4s
122+
sha1su1 v2.4s, v1.4s
123+
sha1su0 v3.4s, v0.4s, v1.4s
124+
125+
// 8
126+
sha1h s18, s6
127+
add v19.4s, v0.4s, v4.4s
128+
sha1p q6, s17, v19.4s
129+
sha1su1 v3.4s, v2.4s
130+
sha1su0 v0.4s, v1.4s, v2.4s
131+
132+
// 9
133+
sha1h s17, s6
134+
add v19.4s, v1.4s, v4.4s
135+
sha1p q6, s18, v19.4s
136+
sha1su1 v0.4s, v3.4s
137+
sha1su0 v1.4s, v2.4s, v3.4s
138+
139+
// k for the next five rounds
140+
adrp x1, .K2@PAGE
141+
ldr q4, [x1, #:lo12:.K2@PAGEOFF]
142+
143+
// 10
144+
sha1h s18, s6
145+
add v19.4s, v2.4s, v4.4s
146+
sha1m q6, s17, v19.4s
147+
sha1su1 v1.4s, v0.4s
148+
sha1su0 v2.4s, v3.4s, v0.4s
149+
150+
// 11
151+
sha1h s17, s6
152+
add v19.4s, v3.4s, v4.4s
153+
sha1m q6, s18, v19.4s
154+
sha1su1 v2.4s, v1.4s
155+
sha1su0 v3.4s, v0.4s, v1.4s
156+
157+
// 12
158+
sha1h s18, s6
159+
add v19.4s, v0.4s, v4.4s
160+
sha1m q6, s17, v19.4s
161+
sha1su1 v3.4s, v2.4s
162+
sha1su0 v0.4s, v1.4s, v2.4s
163+
164+
// 13
165+
sha1h s17, s6
166+
add v19.4s, v1.4s, v4.4s
167+
sha1m q6, s18, v19.4s
168+
sha1su1 v0.4s, v3.4s
169+
sha1su0 v1.4s, v2.4s, v3.4s
170+
171+
// 14
172+
sha1h s18, s6
173+
add v19.4s, v2.4s, v4.4s
174+
sha1m q6, s17, v19.4s
175+
sha1su1 v1.4s, v0.4s
176+
sha1su0 v2.4s, v3.4s, v0.4s
177+
178+
// k for the next five rounds
179+
adrp x1, .K3@PAGE
180+
ldr q4, [x1, #:lo12:.K3@PAGEOFF]
181+
182+
// 15
183+
sha1h s17, s6
184+
add v19.4s, v3.4s, v4.4s
185+
sha1p q6, s18, v19.4s
186+
sha1su1 v2.4s, v1.4s
187+
sha1su0 v3.4s, v0.4s, v1.4s
188+
189+
// 16
190+
sha1h s18, s6
191+
add v19.4s, v0.4s, v4.4s
192+
sha1p q6, s17, v19.4s
193+
sha1su1 v3.4s, v2.4s
194+
195+
// 17
196+
sha1h s17, s6
197+
add v19.4s, v1.4s, v4.4s
198+
sha1p q6, s18, v19.4s
199+
200+
// 18
201+
sha1h s18, s6
202+
add v19.4s, v2.4s, v4.4s
203+
sha1p q6, s17, v19.4s
204+
205+
// 19
206+
sha1h s17, s6
207+
add v19.4s, v3.4s, v4.4s
208+
sha1p q6, s18, v19.4s
209+
210+
// Update state
211+
add v6.4s, v6.4s, v5.4s
212+
str q6, [x0]
213+
add v16.2s, v16.2s, v17.2s
214+
str s16, [x0, 16]
215+
216+
ret
217+
.align 4
218+
.K0:
219+
.word 0x5A827999
220+
.word 0x5A827999
221+
.word 0x5A827999
222+
.word 0x5A827999
223+
.K1:
224+
.word 0x6ED9EBA1
225+
.word 0x6ED9EBA1
226+
.word 0x6ED9EBA1
227+
.word 0x6ED9EBA1
228+
.K2:
229+
.word 0x8F1BBCDC
230+
.word 0x8F1BBCDC
231+
.word 0x8F1BBCDC
232+
.word 0x8F1BBCDC
233+
.K3:
234+
.word 0xCA62C1D6
235+
.word 0xCA62C1D6
236+
.word 0xCA62C1D6
237+
.word 0xCA62C1D6

‎sha2/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ fn main() {
22
use std::env;
33

44
let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default();
5-
let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();
5+
let target_vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap_or_default();
66

77
let mut build256 = cc::Build::new();
88
let (sha256_path, sha512_path) = if target_arch == "x86" {
99
("src/sha256_x86.S", "src/sha512_x86.S")
1010
} else if target_arch == "x86_64" {
1111
("src/sha256_x64.S", "src/sha512_x64.S")
12-
} else if target_arch == "aarch64" && target_os == "macos" {
12+
} else if target_arch == "aarch64" && target_vendor == "apple" {
1313
build256.flag("-march=armv8-a+crypto");
14-
("src/sha256_aarch64_macos.S", "")
14+
("src/sha256_aarch64_apple.S", "")
1515
} else if target_arch == "aarch64" {
1616
build256.flag("-march=armv8-a+crypto");
1717
("src/sha256_aarch64.S", "")

‎sha2/src/sha256_aarch64_macos.S renamed to ‎sha2/src/sha256_aarch64_apple.S

File renamed without changes.

0 commit comments

Comments
 (0)