diff options
| author | Theo Buehler <tb@openbsd.org> | 2024-03-27 22:39:38 -0600 |
|---|---|---|
| committer | Theo Buehler <tb@openbsd.org> | 2024-03-27 22:41:06 -0600 |
| commit | ade8bb88919cd1c42018ee9cee1e77ba118518cf (patch) | |
| tree | 69e335bbc7dfa50e3f2960e33f348543f0ea52d9 | |
| parent | c4afef67c4f82bebc5d06276baea0d87c272f1b1 (diff) | |
| download | portable-ade8bb88919cd1c42018ee9cee1e77ba118518cf.tar.gz portable-ade8bb88919cd1c42018ee9cee1e77ba118518cf.tar.bz2 portable-ade8bb88919cd1c42018ee9cee1e77ba118518cf.zip | |
Rebase weird _WIN32 hack for BN
| -rw-r--r-- | patches/win32_amd64_bn_arch.h.patch | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/patches/win32_amd64_bn_arch.h.patch b/patches/win32_amd64_bn_arch.h.patch index ad7c89d..b7926e3 100644 --- a/patches/win32_amd64_bn_arch.h.patch +++ b/patches/win32_amd64_bn_arch.h.patch | |||
| @@ -1,21 +1,26 @@ | |||
| 1 | --- crypto/bn/arch/amd64/bn_arch.h.orig 2023-02-27 04:43:12.257874699 -0600 | 1 | We should consider a OPENSSL_NO_BN_ASM if we can't figure |
| 2 | +++ crypto/bn/arch/amd64/bn_arch.h 2023-02-27 04:44:05.541873870 -0600 | 2 | out how to fix BIGNUM on this OS |
| 3 | @@ -20,6 +20,12 @@ | 3 | |
| 4 | --- crypto/bn/arch/amd64/bn_arch.h.orig Wed Mar 27 22:17:03 2024 | ||
| 5 | +++ crypto/bn/arch/amd64/bn_arch.h Wed Mar 27 22:17:31 2024 | ||
| 6 | @@ -20,8 +20,14 @@ | ||
| 4 | #ifndef HEADER_BN_ARCH_H | 7 | #ifndef HEADER_BN_ARCH_H |
| 5 | #define HEADER_BN_ARCH_H | 8 | #define HEADER_BN_ARCH_H |
| 6 | 9 | ||
| 7 | +#ifdef _WIN32 | 10 | +#ifdef _WIN32 |
| 8 | +#ifndef OPENSSL_NO_ASM | 11 | #ifndef OPENSSL_NO_ASM |
| 9 | +#define OPENSSL_NO_ASM | 12 | +#define OPENSSL_NO_ASM |
| 10 | +#endif | 13 | +#endif |
| 11 | +#else | 14 | +#else |
| 12 | + | ||
| 13 | #ifndef OPENSSL_NO_ASM | ||
| 14 | 15 | ||
| 16 | +#ifndef OPENSSL_NO_ASM | ||
| 17 | + | ||
| 15 | #define HAVE_BN_ADD | 18 | #define HAVE_BN_ADD |
| 16 | @@ -85,6 +91,7 @@ | 19 | #define HAVE_BN_ADD_WORDS |
| 17 | *out_r0 = r0; | 20 | |
| 21 | @@ -104,6 +110,7 @@ bn_subw(BN_ULONG a, BN_ULONG b, BN_ULONG *out_borrow, | ||
| 18 | } | 22 | } |
| 23 | |||
| 19 | #endif /* __GNUC__ */ | 24 | #endif /* __GNUC__ */ |
| 20 | +#endif /* _WIN32 */ | 25 | +#endif /* _WIN32 */ |
| 21 | 26 | ||