[openssh-commits] [openssh] 02/02: Define OPENSSL_NO_SHA including OpenSSL from test.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 639c440f6c3c2a8216a5eb9455ef13bf4204089c
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Wed Oct 6 17:09:31 2021 +1100

    Define OPENSSL_NO_SHA including OpenSSL from test.
    
    We don't use SHA256 from OpenSSL in the sk-dummy module and the
    definitions can conflict with system sha2.h (eg on NetBSD) so define
    OPENSSL_NO_SHA so we don't attempt to redefine them.
---
 regress/misc/sk-dummy/sk-dummy.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/regress/misc/sk-dummy/sk-dummy.c b/regress/misc/sk-dummy/sk-dummy.c
index 928d556b..579d6098 100644
--- a/regress/misc/sk-dummy/sk-dummy.c
+++ b/regress/misc/sk-dummy/sk-dummy.c
@@ -36,6 +36,8 @@
 #endif
 
 #ifdef WITH_OPENSSL
+/* We don't use sha2 from OpenSSL and they can conflict with system sha2.h */
+#define OPENSSL_NO_SHA
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.