From 727560e6011efcb36d2f3ac6910444bc775abaa1 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 28 Mar 2023 18:06:42 +1100 Subject: [PATCH] Prevent conflicts between Solaris SHA2 and OpenSSL. We used to prevent conflicts between native SHA2 headers and OpenSSL's by setting OPENSSL_NO_SHA but that was removed prior to OpenSSL 1.1.0 --- regress/misc/sk-dummy/sk-dummy.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/regress/misc/sk-dummy/sk-dummy.c b/regress/misc/sk-dummy/sk-dummy.c index 507f3f568..1235bea30 100644 --- a/regress/misc/sk-dummy/sk-dummy.c +++ b/regress/misc/sk-dummy/sk-dummy.c @@ -36,9 +36,31 @@ #endif #ifdef WITH_OPENSSL -/* We don't use sha2 from OpenSSL and they can conflict with system sha2.h */ +/* + * We use native (or compat) SHA2, but some bits of OpenSSL conflict with + * some native sha2 implementations. SHA2 is no longer optional in OpenSSL, + * so prevent conflicts as best we can. + */ #define USE_LIBC_SHA2 /* NetBSD 9 */ +#define SHA256_CTX openssl_SHA256_CTX +#define SHA512_CTX openssl_SHA512_CTX +#ifdef SHA1 +# undef SHA1 +#endif +#ifdef SHA224 +# undef SHA224 +#endif +#ifdef SHA256 +# undef SHA256 +#endif +#ifdef SHA384 +# undef SHA384 +#endif +#ifdef SHA512 +# undef SHA512 +#endif #include +#include #include #include #include