diff options
| author | jsing <> | 2026-01-17 14:30:37 +0000 |
|---|---|---|
| committer | jsing <> | 2026-01-17 14:30:37 +0000 |
| commit | db12bd9b580e2fc1c5c7d3224d2d9d0f534d1b8d (patch) | |
| tree | d8886890844b745822e02557ecb2251ea4786398 /src/lib/libcrypto/arch/alpha | |
| parent | 1dd1aaafcbe820792a0f2e002a85a22055696509 (diff) | |
| download | openbsd-db12bd9b580e2fc1c5c7d3224d2d9d0f534d1b8d.tar.gz openbsd-db12bd9b580e2fc1c5c7d3224d2d9d0f534d1b8d.tar.bz2 openbsd-db12bd9b580e2fc1c5c7d3224d2d9d0f534d1b8d.zip | |
Replace GHASH_ASM with function specific defines.
Use the same pattern that is now used for most other code - provide HAVE_*
defines for functions and use these to selectively enable source code.
Diffstat (limited to 'src/lib/libcrypto/arch/alpha')
| -rw-r--r-- | src/lib/libcrypto/arch/alpha/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/alpha/crypto_arch.h | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc index 1073ac3c1e..d89f32dc9d 100644 --- a/src/lib/libcrypto/arch/alpha/Makefile.inc +++ b/src/lib/libcrypto/arch/alpha/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.15 2025/02/14 12:01:58 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.16 2026/01/17 14:30:37 jsing Exp $ |
| 2 | 2 | ||
| 3 | # alpha-specific libcrypto build rules | 3 | # alpha-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -6,7 +6,6 @@ | |||
| 6 | SSLASM+= bn alpha-mont | 6 | SSLASM+= bn alpha-mont |
| 7 | CFLAGS+= -DOPENSSL_BN_ASM_MONT | 7 | CFLAGS+= -DOPENSSL_BN_ASM_MONT |
| 8 | # modes | 8 | # modes |
| 9 | CFLAGS+= -DGHASH_ASM | ||
| 10 | SSLASM+= modes ghash-alpha | 9 | SSLASM+= modes ghash-alpha |
| 11 | # sha | 10 | # sha |
| 12 | SSLASM+= sha sha1-alpha | 11 | SSLASM+= sha sha1-alpha |
diff --git a/src/lib/libcrypto/arch/alpha/crypto_arch.h b/src/lib/libcrypto/arch/alpha/crypto_arch.h index 1d553b7e07..8fec3e2855 100644 --- a/src/lib/libcrypto/arch/alpha/crypto_arch.h +++ b/src/lib/libcrypto/arch/alpha/crypto_arch.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: crypto_arch.h,v 1.2 2025/02/14 12:01:58 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_arch.h,v 1.3 2026/01/17 14:30:37 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -18,7 +18,14 @@ | |||
| 18 | #ifndef HEADER_CRYPTO_ARCH_H | 18 | #ifndef HEADER_CRYPTO_ARCH_H |
| 19 | #define HEADER_CRYPTO_ARCH_H | 19 | #define HEADER_CRYPTO_ARCH_H |
| 20 | 20 | ||
| 21 | #ifndef OPENSSL_NO_ASM | ||
| 22 | |||
| 23 | #define HAVE_GCM_GHASH_4BIT | ||
| 24 | #define HAVE_GCM_GMULT_4BIT | ||
| 25 | |||
| 21 | #define HAVE_SHA1_BLOCK_DATA_ORDER | 26 | #define HAVE_SHA1_BLOCK_DATA_ORDER |
| 22 | #define HAVE_SHA1_BLOCK_GENERIC | 27 | #define HAVE_SHA1_BLOCK_GENERIC |
| 23 | 28 | ||
| 24 | #endif | 29 | #endif |
| 30 | |||
| 31 | #endif | ||
