]> git.ipfire.org Git - thirdparty/openssh-portable.git/commit
Prefer OpenSSL's SHA256 in sk-dummy.so
authorDarren Tucker <dtucker@dtucker.net>
Wed, 26 Jul 2023 16:46:45 +0000 (02:46 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Wed, 26 Jul 2023 16:46:45 +0000 (02:46 +1000)
commit9855f9178b454bfb5215efa4e9dcb001dc5198a1
tree0fa60a4a89db9d885f02fde3462c041361a7cdf1
parent8fdca57039476178392660439ff1e715d0efbcb7
Prefer OpenSSL's SHA256 in sk-dummy.so

Previously sk-dummy.so used libc's (or compat's) SHA256 since it may be
built without OpenSSL.  In many cases, however, including both libc's
and OpenSSL's headers together caused conflicting definitions.

We tried working around this (on OpenSSL <1.1 you could define
OPENSSL_NO_SHA, NetBSD had USE_LIBC_SHA2, various #define hacks) with
varying levels of success.  Since OpenSSL >=1.1 removed OPENSSL_NO_SHA
and including most OpenSSL headers would bring sha.h in, even if it
wasn't used directly this was a constant hassle.

Admit defeat and use OpenSSL's SHA256 unless we aren't using OpenSSL
at all.  ok djm@
regress/misc/sk-dummy/sk-dummy.c