diff options
Diffstat (limited to 'src/lib/libcrypto')
| -rw-r--r-- | src/lib/libcrypto/crypto_assembly.h | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/sha256_aarch64_ce.S | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/sha512_aarch64_ce.S | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/lib/libcrypto/crypto_assembly.h b/src/lib/libcrypto/crypto_assembly.h index b291de4f17..22102d3fac 100644 --- a/src/lib/libcrypto/crypto_assembly.h +++ b/src/lib/libcrypto/crypto_assembly.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto_assembly.h,v 1.3 2026/05/07 15:40:33 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_assembly.h,v 1.4 2026/05/07 15:41:37 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2026 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2026 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -37,10 +37,15 @@ | |||
| 37 | #define CRYPTO_ASSEMBLY_SECTION_TEXT __TEXT,__text | 37 | #define CRYPTO_ASSEMBLY_SECTION_TEXT __TEXT,__text |
| 38 | #define CRYPTO_ASSEMBLY_SECTION_RODATA __DATA,__const | 38 | #define CRYPTO_ASSEMBLY_SECTION_RODATA __DATA,__const |
| 39 | 39 | ||
| 40 | #define CRYPTO_ASSEMBLY_AARCH64_SYM_HI(name) name@PAGE | ||
| 41 | #define CRYPTO_ASSEMBLY_AARCH64_SYM_LO(name) name@PAGEOFF | ||
| 42 | |||
| 40 | #else | 43 | #else |
| 41 | #define CRYPTO_ASSEMBLY_SECTION_TEXT .text | 44 | #define CRYPTO_ASSEMBLY_SECTION_TEXT .text |
| 42 | #define CRYPTO_ASSEMBLY_SECTION_RODATA .rodata | 45 | #define CRYPTO_ASSEMBLY_SECTION_RODATA .rodata |
| 43 | 46 | ||
| 47 | #define CRYPTO_ASSEMBLY_AARCH64_SYM_HI(name) name | ||
| 48 | #define CRYPTO_ASSEMBLY_AARCH64_SYM_LO(name) :lo12:name | ||
| 44 | #endif | 49 | #endif |
| 45 | 50 | ||
| 46 | #endif | 51 | #endif |
diff --git a/src/lib/libcrypto/sha/sha256_aarch64_ce.S b/src/lib/libcrypto/sha/sha256_aarch64_ce.S index aef164ebe9..c08ba27e9f 100644 --- a/src/lib/libcrypto/sha/sha256_aarch64_ce.S +++ b/src/lib/libcrypto/sha/sha256_aarch64_ce.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sha256_aarch64_ce.S,v 1.8 2026/05/07 15:40:33 jsing Exp $ */ | 1 | /* $OpenBSD: sha256_aarch64_ce.S,v 1.9 2026/05/07 15:41:37 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2023,2025 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2023,2025 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -107,8 +107,8 @@ | |||
| 107 | sha256_block_ce: | 107 | sha256_block_ce: |
| 108 | 108 | ||
| 109 | /* Address of SHA-256 constants. */ | 109 | /* Address of SHA-256 constants. */ |
| 110 | adrp k256_base, K256 | 110 | adrp k256_base, CRYPTO_ASSEMBLY_AARCH64_SYM_HI(K256) |
| 111 | add k256_base, k256_base, :lo12:K256 | 111 | add k256_base, k256_base, CRYPTO_ASSEMBLY_AARCH64_SYM_LO(K256) |
| 112 | 112 | ||
| 113 | /* | 113 | /* |
| 114 | * Load current hash state from context. | 114 | * Load current hash state from context. |
diff --git a/src/lib/libcrypto/sha/sha512_aarch64_ce.S b/src/lib/libcrypto/sha/sha512_aarch64_ce.S index a5adae1b38..af59706258 100644 --- a/src/lib/libcrypto/sha/sha512_aarch64_ce.S +++ b/src/lib/libcrypto/sha/sha512_aarch64_ce.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sha512_aarch64_ce.S,v 1.6 2026/05/07 15:40:33 jsing Exp $ */ | 1 | /* $OpenBSD: sha512_aarch64_ce.S,v 1.7 2026/05/07 15:41:37 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2023,2025 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2023,2025 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -181,8 +181,8 @@ sha512_block_ce: | |||
| 181 | st4 {v12.d, v13.d, v14.d, v15.d}[0], [sp] | 181 | st4 {v12.d, v13.d, v14.d, v15.d}[0], [sp] |
| 182 | 182 | ||
| 183 | /* Address of SHA-512 constants. */ | 183 | /* Address of SHA-512 constants. */ |
| 184 | adrp k512_base, K512 | 184 | adrp k512_base, CRYPTO_ASSEMBLY_AARCH64_SYM_HI(K512) |
| 185 | add k512_base, k512_base, :lo12:K512 | 185 | add k512_base, k512_base, CRYPTO_ASSEMBLY_AARCH64_SYM_LO(K512) |
| 186 | 186 | ||
| 187 | /* | 187 | /* |
| 188 | * Load current hash state from context. | 188 | * Load current hash state from context. |
