diff options
| author | jsing <> | 2026-01-17 06:31:45 +0000 |
|---|---|---|
| committer | jsing <> | 2026-01-17 06:31:45 +0000 |
| commit | 650cf9e91c9b18210aaa53983bfb7725a344b7bb (patch) | |
| tree | 8c9f6fc33c5d267aae4038f3d8170e21654682c5 /src/lib | |
| parent | f8fcc4d17be5065d3823964ee7fd62dbfb090e96 (diff) | |
| download | openbsd-650cf9e91c9b18210aaa53983bfb7725a344b7bb.tar.gz openbsd-650cf9e91c9b18210aaa53983bfb7725a344b7bb.tar.bz2 openbsd-650cf9e91c9b18210aaa53983bfb7725a344b7bb.zip | |
gas dislikes bare .rodata - add .section before .rodata to make it happier
(LLVM does not care and is happy with either). For consistency, do the same
with .text.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/sha/sha1_aarch64_ce.S | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/sha1_amd64_generic.S | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/sha1_amd64_shani.S | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/sha256_aarch64_ce.S | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/sha256_amd64_generic.S | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/sha256_amd64_shani.S | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/sha512_aarch64_ce.S | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/sha/sha512_amd64_generic.S | 7 |
8 files changed, 26 insertions, 22 deletions
diff --git a/src/lib/libcrypto/sha/sha1_aarch64_ce.S b/src/lib/libcrypto/sha/sha1_aarch64_ce.S index bef969ca4e..ce7eb81115 100644 --- a/src/lib/libcrypto/sha/sha1_aarch64_ce.S +++ b/src/lib/libcrypto/sha/sha1_aarch64_ce.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sha1_aarch64_ce.S,v 1.2 2026/01/17 06:23:42 jsing Exp $ */ | 1 | /* $OpenBSD: sha1_aarch64_ce.S,v 1.3 2026/01/17 06:31:45 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 | * |
| @@ -99,7 +99,7 @@ | |||
| 99 | 99 | ||
| 100 | .arch armv8-a+sha2 | 100 | .arch armv8-a+sha2 |
| 101 | 101 | ||
| 102 | .text | 102 | .section .text |
| 103 | 103 | ||
| 104 | /* | 104 | /* |
| 105 | * void sha1_block_ce(SHA256_CTX *ctx, const void *in, size_t num); | 105 | * void sha1_block_ce(SHA256_CTX *ctx, const void *in, size_t num); |
diff --git a/src/lib/libcrypto/sha/sha1_amd64_generic.S b/src/lib/libcrypto/sha/sha1_amd64_generic.S index 38f49b0c3c..685d71edf8 100644 --- a/src/lib/libcrypto/sha/sha1_amd64_generic.S +++ b/src/lib/libcrypto/sha/sha1_amd64_generic.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sha1_amd64_generic.S,v 1.2 2025/01/18 02:56:07 jsing Exp $ */ | 1 | /* $OpenBSD: sha1_amd64_generic.S,v 1.3 2026/01/17 06:31:45 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -156,7 +156,7 @@ | |||
| 156 | sha1_message_schedule_update(idx, %rsp, tmp0) \ | 156 | sha1_message_schedule_update(idx, %rsp, tmp0) \ |
| 157 | sha1_round_parity(a, b, c, d, e, 0xca62c1d6, tmp0) | 157 | sha1_round_parity(a, b, c, d, e, 0xca62c1d6, tmp0) |
| 158 | 158 | ||
| 159 | .text | 159 | .section .text |
| 160 | 160 | ||
| 161 | /* | 161 | /* |
| 162 | * void sha1_block_generic(SHA1_CTX *ctx, const void *in, size_t num); | 162 | * void sha1_block_generic(SHA1_CTX *ctx, const void *in, size_t num); |
diff --git a/src/lib/libcrypto/sha/sha1_amd64_shani.S b/src/lib/libcrypto/sha/sha1_amd64_shani.S index d7699d10f1..751554f1d5 100644 --- a/src/lib/libcrypto/sha/sha1_amd64_shani.S +++ b/src/lib/libcrypto/sha/sha1_amd64_shani.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sha1_amd64_shani.S,v 1.1 2024/12/06 11:57:18 jsing Exp $ */ | 1 | /* $OpenBSD: sha1_amd64_shani.S,v 1.2 2026/01/17 06:31:45 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -71,7 +71,7 @@ | |||
| 71 | sha1_shani_round(fn, xm0, xe, xe_next); | 71 | sha1_shani_round(fn, xm0, xe, xe_next); |
| 72 | 72 | ||
| 73 | 73 | ||
| 74 | .text | 74 | .section .text |
| 75 | 75 | ||
| 76 | /* | 76 | /* |
| 77 | * void sha1_block_shani(SHA256_CTX *ctx, const void *in, size_t num); | 77 | * void sha1_block_shani(SHA256_CTX *ctx, const void *in, size_t num); |
| @@ -157,7 +157,7 @@ sha1_block_shani: | |||
| 157 | 157 | ||
| 158 | ret | 158 | ret |
| 159 | 159 | ||
| 160 | .rodata | 160 | .section .rodata |
| 161 | 161 | ||
| 162 | /* | 162 | /* |
| 163 | * Shuffle mask - byte reversal for little endian to big endian word conversion, | 163 | * Shuffle mask - byte reversal for little endian to big endian word conversion, |
diff --git a/src/lib/libcrypto/sha/sha256_aarch64_ce.S b/src/lib/libcrypto/sha/sha256_aarch64_ce.S index 1d9bb2e03e..b66969427b 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.3 2026/01/17 06:23:42 jsing Exp $ */ | 1 | /* $OpenBSD: sha256_aarch64_ce.S,v 1.4 2026/01/17 06:31:45 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 | * |
| @@ -84,7 +84,7 @@ | |||
| 84 | 84 | ||
| 85 | .arch armv8-a+sha2 | 85 | .arch armv8-a+sha2 |
| 86 | 86 | ||
| 87 | .text | 87 | .section .text |
| 88 | 88 | ||
| 89 | /* | 89 | /* |
| 90 | * void sha256_block_ce(SHA256_CTX *ctx, const void *in, size_t num); | 90 | * void sha256_block_ce(SHA256_CTX *ctx, const void *in, size_t num); |
| @@ -163,10 +163,11 @@ sha256_block_ce: | |||
| 163 | 163 | ||
| 164 | ret | 164 | ret |
| 165 | 165 | ||
| 166 | .section .rodata | ||
| 167 | |||
| 166 | /* | 168 | /* |
| 167 | * SHA-256 constants - see FIPS 180-4 section 4.2.3. | 169 | * SHA-256 constants - see FIPS 180-4 section 4.2.3. |
| 168 | */ | 170 | */ |
| 169 | .rodata | ||
| 170 | .align 4 | 171 | .align 4 |
| 171 | .type K256,@object | 172 | .type K256,@object |
| 172 | K256: | 173 | K256: |
diff --git a/src/lib/libcrypto/sha/sha256_amd64_generic.S b/src/lib/libcrypto/sha/sha256_amd64_generic.S index 166bce9ca8..a5bb3eca42 100644 --- a/src/lib/libcrypto/sha/sha256_amd64_generic.S +++ b/src/lib/libcrypto/sha/sha256_amd64_generic.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sha256_amd64_generic.S,v 1.3 2024/11/16 12:34:16 jsing Exp $ */ | 1 | /* $OpenBSD: sha256_amd64_generic.S,v 1.4 2026/01/17 06:31:45 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -143,7 +143,7 @@ | |||
| 143 | sha256_message_schedule_update(idx, %rsp, tmp0) \ | 143 | sha256_message_schedule_update(idx, %rsp, tmp0) \ |
| 144 | sha256_round(idx, a, b, c, d, e, f, g, h, k256, %rsp, tmp0) | 144 | sha256_round(idx, a, b, c, d, e, f, g, h, k256, %rsp, tmp0) |
| 145 | 145 | ||
| 146 | .text | 146 | .section .text |
| 147 | 147 | ||
| 148 | /* | 148 | /* |
| 149 | * void sha256_block_generic(SHA256_CTX *ctx, const void *in, size_t num); | 149 | * void sha256_block_generic(SHA256_CTX *ctx, const void *in, size_t num); |
| @@ -276,10 +276,11 @@ sha256_block_generic: | |||
| 276 | 276 | ||
| 277 | ret | 277 | ret |
| 278 | 278 | ||
| 279 | .section .rodata | ||
| 280 | |||
| 279 | /* | 281 | /* |
| 280 | * SHA-256 constants - see FIPS 180-4 section 4.2.2. | 282 | * SHA-256 constants - see FIPS 180-4 section 4.2.2. |
| 281 | */ | 283 | */ |
| 282 | .rodata | ||
| 283 | .align 64 | 284 | .align 64 |
| 284 | .type K256,@object | 285 | .type K256,@object |
| 285 | K256: | 286 | K256: |
diff --git a/src/lib/libcrypto/sha/sha256_amd64_shani.S b/src/lib/libcrypto/sha/sha256_amd64_shani.S index df3a796b45..e43ecfa51f 100644 --- a/src/lib/libcrypto/sha/sha256_amd64_shani.S +++ b/src/lib/libcrypto/sha/sha256_amd64_shani.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sha256_amd64_shani.S,v 1.1 2024/11/16 15:31:36 jsing Exp $ */ | 1 | /* $OpenBSD: sha256_amd64_shani.S,v 1.2 2026/01/17 06:31:45 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -80,7 +80,7 @@ | |||
| 80 | movdqa xmt0, xmsg; \ | 80 | movdqa xmt0, xmsg; \ |
| 81 | sha256_shani_round(idx); | 81 | sha256_shani_round(idx); |
| 82 | 82 | ||
| 83 | .text | 83 | .section .text |
| 84 | 84 | ||
| 85 | /* | 85 | /* |
| 86 | * void sha256_block_shani(SHA256_CTX *ctx, const void *in, size_t num); | 86 | * void sha256_block_shani(SHA256_CTX *ctx, const void *in, size_t num); |
| @@ -173,7 +173,7 @@ sha256_block_shani: | |||
| 173 | 173 | ||
| 174 | ret | 174 | ret |
| 175 | 175 | ||
| 176 | .rodata | 176 | .section .rodata |
| 177 | 177 | ||
| 178 | /* | 178 | /* |
| 179 | * Shuffle mask - little endian to big endian word conversion. | 179 | * Shuffle mask - little endian to big endian word conversion. |
diff --git a/src/lib/libcrypto/sha/sha512_aarch64_ce.S b/src/lib/libcrypto/sha/sha512_aarch64_ce.S index 2d41e699ce..bec56a49e5 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.2 2026/01/17 06:23:42 jsing Exp $ */ | 1 | /* $OpenBSD: sha512_aarch64_ce.S,v 1.3 2026/01/17 06:31:45 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 | * |
| @@ -151,7 +151,7 @@ | |||
| 151 | 151 | ||
| 152 | .arch armv8-a+sha3 | 152 | .arch armv8-a+sha3 |
| 153 | 153 | ||
| 154 | .text | 154 | .section .text |
| 155 | 155 | ||
| 156 | /* | 156 | /* |
| 157 | * void sha512_block_ce(SHA512_CTX *ctx, const void *in, size_t num); | 157 | * void sha512_block_ce(SHA512_CTX *ctx, const void *in, size_t num); |
| @@ -282,10 +282,11 @@ sha512_block_ce: | |||
| 282 | 282 | ||
| 283 | ret | 283 | ret |
| 284 | 284 | ||
| 285 | .section .rodata | ||
| 286 | |||
| 285 | /* | 287 | /* |
| 286 | * SHA-512 constants - see FIPS 180-4 section 4.2.3. | 288 | * SHA-512 constants - see FIPS 180-4 section 4.2.3. |
| 287 | */ | 289 | */ |
| 288 | .rodata | ||
| 289 | .align 4 | 290 | .align 4 |
| 290 | .type K512,@object | 291 | .type K512,@object |
| 291 | K512: | 292 | K512: |
diff --git a/src/lib/libcrypto/sha/sha512_amd64_generic.S b/src/lib/libcrypto/sha/sha512_amd64_generic.S index 8419d60b8e..3b6a9719e1 100644 --- a/src/lib/libcrypto/sha/sha512_amd64_generic.S +++ b/src/lib/libcrypto/sha/sha512_amd64_generic.S | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: sha512_amd64_generic.S,v 1.1 2024/11/16 14:56:39 jsing Exp $ */ | 1 | /* $OpenBSD: sha512_amd64_generic.S,v 1.2 2026/01/17 06:31:45 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -144,7 +144,7 @@ | |||
| 144 | sha512_message_schedule_update(idx, %rsp, tmp0) \ | 144 | sha512_message_schedule_update(idx, %rsp, tmp0) \ |
| 145 | sha512_round(idx, a, b, c, d, e, f, g, h, k512, %rsp, tmp0) | 145 | sha512_round(idx, a, b, c, d, e, f, g, h, k512, %rsp, tmp0) |
| 146 | 146 | ||
| 147 | .text | 147 | .section .text |
| 148 | 148 | ||
| 149 | /* | 149 | /* |
| 150 | * void sha512_block_generic(SHA512_CTX *ctx, const void *in, size_t num); | 150 | * void sha512_block_generic(SHA512_CTX *ctx, const void *in, size_t num); |
| @@ -277,10 +277,11 @@ sha512_block_generic: | |||
| 277 | 277 | ||
| 278 | ret | 278 | ret |
| 279 | 279 | ||
| 280 | .section .rodata | ||
| 281 | |||
| 280 | /* | 282 | /* |
| 281 | * SHA-512 constants - see FIPS 180-4 section 4.2.3. | 283 | * SHA-512 constants - see FIPS 180-4 section 4.2.3. |
| 282 | */ | 284 | */ |
| 283 | .rodata | ||
| 284 | .align 64 | 285 | .align 64 |
| 285 | .type K512,@object | 286 | .type K512,@object |
| 286 | K512: | 287 | K512: |
