diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2018-10-10 15:38:33 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2018-10-10 15:38:33 +0000 |
| commit | 0816c38f75e7841dd97c8d1ea76db02dc7356a42 (patch) | |
| tree | 0913cda8bdb7fd034816de91a59787432cbba59b /crypto | |
| parent | ca79ce90a146e2972ddcf9cf6522292f38ee95fd (diff) | |
| download | src-0816c38f75e7841dd97c8d1ea76db02dc7356a42.tar.gz src-0816c38f75e7841dd97c8d1ea76db02dc7356a42.zip | |
MFC r338810: openssh: rename local macro to avoid OpenSSL 1.1.1 conflict
Local changes introduced an OPENSSH_VERSION macro, but this conflicts
with a macro of the same name introduced with OepnsSL 1.1.1
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/stable/11/; revision=339285
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssh/ssh.c | 6 | ||||
| -rw-r--r-- | crypto/openssh/sshd.c | 4 | ||||
| -rw-r--r-- | crypto/openssh/version.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index 05afc3cf9455..c86ea2fff161 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -765,10 +765,10 @@ main(int ac, char **av) *options.version_addendum != '\0') fprintf(stderr, "%s %s, %s\n", SSH_RELEASE, options.version_addendum, - OPENSSL_VERSION); + OPENSSL_VERSION_STRING); else fprintf(stderr, "%s, %s\n", SSH_RELEASE, - OPENSSL_VERSION); + OPENSSL_VERSION_STRING); if (opt == 'V') exit(0); break; @@ -1013,7 +1013,7 @@ main(int ac, char **av) if (debug_flag) /* version_addendum is always NULL at this point */ - logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION); + logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION_STRING); /* Parse the configuration files */ process_config_files(host_arg, pw, 0); diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index ac494844430d..1dd2961436e7 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -924,10 +924,10 @@ usage(void) if (options.version_addendum && *options.version_addendum != '\0') fprintf(stderr, "%s %s, %s\n", SSH_RELEASE, - options.version_addendum, OPENSSL_VERSION); + options.version_addendum, OPENSSL_VERSION_STRING); else fprintf(stderr, "%s, %s\n", - SSH_RELEASE, OPENSSL_VERSION); + SSH_RELEASE, OPENSSL_VERSION_STRING); fprintf(stderr, "usage: sshd [-46DdeiqTt] [-C connection_spec] [-c host_cert_file]\n" " [-E log_file] [-f config_file] [-g login_grace_time]\n" diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 6285d9a547f6..409976ddf893 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -9,7 +9,7 @@ #define SSH_VERSION_FREEBSD "FreeBSD-20170903" #ifdef WITH_OPENSSL -#define OPENSSL_VERSION SSLeay_version(SSLEAY_VERSION) +#define OPENSSL_VERSION_STRING SSLeay_version(SSLEAY_VERSION) #else -#define OPENSSL_VERSION "without OpenSSL" +#define OPENSSL_VERSION_STRING "without OpenSSL" #endif |