[openssh-commits] [openssh] 01/01: make sk-dummy.so work without libcrypto installed

[git+noreply at mindrot.org]

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

djm pushed a commit to branch master
in repository openssh.

commit 16a25414f303cd6790eb967aeb962040e32c9c7a
Author: Damien Miller <djm at mindrot.org>
Date:   Fri Oct 1 22:40:06 2021 +1000

    make sk-dummy.so work without libcrypto installed
---
 regress/misc/sk-dummy/sk-dummy.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/regress/misc/sk-dummy/sk-dummy.c b/regress/misc/sk-dummy/sk-dummy.c
index 4003362d..c107aebe 100644
--- a/regress/misc/sk-dummy/sk-dummy.c
+++ b/regress/misc/sk-dummy/sk-dummy.c
@@ -28,6 +28,11 @@
 #include "crypto_api.h"
 #include "sk-api.h"
 
+#if defined(WITH_OPENSSL) && !defined(WITH_OPENSSL)
+# undef WITH_OPENSSL
+#endif
+
+#ifdef WITH_OPENSSL
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
@@ -36,8 +41,6 @@
 #include <openssl/ecdsa.h>
 #include <openssl/pem.h>
 
-/* #define SK_DEBUG 1 */
-
 /* Compatibility with OpenSSH 1.0.x */
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
 #define ECDSA_SIG_get0(sig, pr, ps) \
@@ -46,6 +49,9 @@
 		(*ps) = sig->s; \
 	} while (0)
 #endif
+#endif /* WITH_OPENSSL */
+
+/* #define SK_DEBUG 1 */
 
 #if SSH_SK_VERSION_MAJOR != 0x00070000
 # error SK API has changed, sk-dummy.c needs an update

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