From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 28 Oct 2019 04:57:22 +0000 (+1100)
Subject: Wrap OpenSSL bits in WITH_OPENSSL.
X-Git-Tag: V_8_2_P1~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=850ec1773d656cbff44d78a79e369dc262ce5853;p=thirdparty%2Fopenssh-portable.git

Wrap OpenSSL bits in WITH_OPENSSL.
---

diff --git a/myproposal.h b/myproposal.h
index 34bd10c9f..45db30e5b 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -24,7 +24,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef WITH_OPENSSL
 #include <openssl/opensslv.h>
+#endif
 
 /* conditional algorithm support */
 
diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c
index 3dd1e1446..ecbfa550f 100644
--- a/sshbuf-getput-crypto.c
+++ b/sshbuf-getput-crypto.c
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/bn.h>
 #ifdef OPENSSL_HAS_ECC
 # include <openssl/ec.h>
@@ -182,4 +183,4 @@ sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v)
 	    EC_KEY_get0_group(v));
 }
 #endif /* OPENSSL_HAS_ECC */
-
+#endif /* WITH_OPENSSL */