Attachment 3177 Details for Bug 2907 – add missing `#ifdef WITH_OPENSSL`

[patch] add missing `#ifdef WITH_OPENSSL`

fix_without-openssl.patch (text/plain), 4.14 KB, created by Max Kellermann on 2018-09-21 05:43:08 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Max Kellermann

Created: 2018-09-21 05:43:08 AEST

Size: 4.14 KB

patch

obsolete

>From b9c78fd9915cfd10e0ad70eba34b15e0036d2911 Mon Sep 17 00:00:00 2001
>From: Max Kellermann <max.kellermann@gmail.com>
>Date: Thu, 20 Sep 2018 20:04:14 +0200
>Subject: [PATCH] auth, ...: add missing `#ifdef WITH_OPENSSL`
>
>Even though OpenSSH doesn't use OpenSSL when built with
>`--without-openssl`, it still needs to include its headers to compile
>code which is unused in this configuration.
>
>Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
>---
> auth.h                 | 2 ++
> cipher.c               | 2 ++
> cipher.h               | 2 ++
> kexc25519.c            | 2 ++
> loginrec.c             | 1 +
> monitor_wrap.h         | 2 ++
> myproposal.h           | 2 ++
> ssh-add.c              | 2 ++
> ssh-keyscan.c          | 2 ++
> sshbuf-getput-crypto.c | 3 +++
> sshkey.c               | 1 +
> 11 files changed, 21 insertions(+)
>
>diff --git a/auth.h b/auth.h
>index 977562f0..f68731ef 100644
>--- a/auth.h
>+++ b/auth.h
>@@ -30,7 +30,9 @@
> 
> #include <signal.h>
> 
>+#ifdef WITH_OPENSSL
> #include <openssl/rsa.h>
>+#endif
> 
> #ifdef HAVE_LOGIN_CAP
> #include <login_cap.h>
>diff --git a/cipher.c b/cipher.c
>index 12c59888..43c2e4df 100644
>--- a/cipher.c
>+++ b/cipher.c
>@@ -55,7 +55,9 @@
> struct sshcipher_ctx {
> 	int	plaintext;
> 	int	encrypt;
>+#ifdef WITH_OPENSSL
> 	EVP_CIPHER_CTX *evp;
>+#endif
> 	struct chachapoly_ctx cp_ctx; /* XXX union with evp? */
> 	struct aesctr_ctx ac_ctx; /* XXX union with evp? */
> 	const struct sshcipher *cipher;
>diff --git a/cipher.h b/cipher.h
>index dc1571d2..954c356a 100644
>--- a/cipher.h
>+++ b/cipher.h
>@@ -38,7 +38,9 @@
> #define CIPHER_H
> 
> #include <sys/types.h>
>+#ifdef WITH_OPENSSL
> #include <openssl/evp.h>
>+#endif
> #include "cipher-chachapoly.h"
> #include "cipher-aesctr.h"
> 
>diff --git a/kexc25519.c b/kexc25519.c
>index 0897b8c5..6a54cf9b 100644
>--- a/kexc25519.c
>+++ b/kexc25519.c
>@@ -32,8 +32,10 @@
> #include <signal.h>
> #include <string.h>
> 
>+#ifdef WITH_OPENSSL
> #include <openssl/bn.h>
> #include <openssl/evp.h>
>+#endif
> 
> #include "sshbuf.h"
> #include "ssh2.h"
>diff --git a/loginrec.c b/loginrec.c
>index 9a427dec..49abe918 100644
>--- a/loginrec.c
>+++ b/loginrec.c
>@@ -166,6 +166,7 @@
> #include <string.h>
> #include <time.h>
> #include <unistd.h>
>+#include <stdlib.h>
> 
> #include "xmalloc.h"
> #include "sshkey.h"
>diff --git a/monitor_wrap.h b/monitor_wrap.h
>index 644da081..56079d97 100644
>--- a/monitor_wrap.h
>+++ b/monitor_wrap.h
>@@ -40,7 +40,9 @@ struct sshauthopt;
> 
> void mm_log_handler(LogLevel, const char *, void *);
> int mm_is_monitor(void);
>+#ifdef WITH_OPENSSL
> DH *mm_choose_dh(int, int, int);
>+#endif
> int mm_sshkey_sign(struct sshkey *, u_char **, size_t *, const u_char *, size_t,
>     const char *, u_int compat);
> void mm_inform_authserv(char *, char *);
>diff --git a/myproposal.h b/myproposal.h
>index 27b4a15a..ad62ef80 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/ssh-add.c b/ssh-add.c
>index adcc4599..526eb39c 100644
>--- a/ssh-add.c
>+++ b/ssh-add.c
>@@ -40,7 +40,9 @@
> #include <sys/types.h>
> #include <sys/stat.h>
> 
>+#ifdef WITH_OPENSSL
> #include <openssl/evp.h>
>+#endif
> #include "openbsd-compat/openssl-compat.h"
> 
> #include <errno.h>
>diff --git a/ssh-keyscan.c b/ssh-keyscan.c
>index 38b1c548..47da5f67 100644
>--- a/ssh-keyscan.c
>+++ b/ssh-keyscan.c
>@@ -19,7 +19,9 @@
> #include <netinet/in.h>
> #include <arpa/inet.h>
> 
>+#ifdef WITH_OPENSSL
> #include <openssl/bn.h>
>+#endif
> 
> #include <netdb.h>
> #include <errno.h>
>diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c
>index d0d791b5..96c8e629 100644
>--- a/sshbuf-getput-crypto.c
>+++ b/sshbuf-getput-crypto.c
>@@ -18,6 +18,8 @@
> #define SSHBUF_INTERNAL
> #include "includes.h"
> 
>+#ifdef WITH_OPENSSL
>+
> #include <sys/types.h>
> #include <stdlib.h>
> #include <stdio.h>
>@@ -222,3 +224,4 @@ sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v)
> }
> #endif /* OPENSSL_HAS_ECC */
> 
>+#endif /* WITH_OPENSSL */
>diff --git a/sshkey.c b/sshkey.c
>index 63c01ea6..c82f0fbe 100644
>--- a/sshkey.c
>+++ b/sshkey.c
>@@ -27,6 +27,7 @@
> 
> #include "includes.h"
> 
>+#include <time.h>
> #include <sys/types.h>
> #include <netinet/in.h>
> 
>-- 
>2.18.0
>

Actions: View | Diff

Attachments on bug 2907: 3177