[openssh-commits] [openssh] 02/06: Wrap OpenSSL bits in WITH_OPENSSL.

git+noreply at mindrot.org git+noreply at mindrot.org
Mon Oct 28 19:02:59 AEDT 2019


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

dtucker pushed a commit to branch master
in repository openssh.

commit 850ec1773d656cbff44d78a79e369dc262ce5853
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Mon Oct 28 15:57:22 2019 +1100

    Wrap OpenSSL bits in WITH_OPENSSL.
---
 myproposal.h           | 2 ++
 sshbuf-getput-crypto.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/myproposal.h b/myproposal.h
index 34bd10c9..45db30e5 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 3dd1e144..ecbfa550 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 */

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


More information about the openssh-commits mailing list