diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2018-09-19 19:13:29 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2018-09-19 19:13:29 +0000 |
| commit | 5d5f8b31cb2602867bb36a622803fa4b80a2346d (patch) | |
| tree | d450ad8453d8c5632a89c6360f663b0262af106b /crypto/openssh | |
| parent | 6bd321e62b61f457a441b0aa8d90332cb563730e (diff) | |
| download | src-5d5f8b31cb2602867bb36a622803fa4b80a2346d.tar.gz src-5d5f8b31cb2602867bb36a622803fa4b80a2346d.zip | |
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 OpenSSL 1.1.1.
Notes
Notes:
svn path=/projects/openssl111/; revision=338805
Diffstat (limited to 'crypto/openssh')
| -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 e78a1366aaef..f79437034a4e 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -811,10 +811,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; @@ -1078,7 +1078,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 7eb282316cff..23d31dd1aeff 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -939,10 +939,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 c362549551e2..e2adeeec3f33 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -9,7 +9,7 @@ #define SSH_VERSION_FREEBSD "FreeBSD-20180909" #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 |