]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
MFC r338810: openssh: rename local macro to avoid OpenSSL 1.1.1 conflict
authoremaste <emaste@FreeBSD.org>
Wed, 10 Oct 2018 15:38:33 +0000 (15:38 +0000)
committeremaste <emaste@FreeBSD.org>
Wed, 10 Oct 2018 15:38:33 +0000 (15:38 +0000)
commit4bb2dc08205d3e7dd374124202e4b6ec64a8a3c2
tree0913cda8bdb7fd034816de91a59787432cbba59b
parentd10325d074c2f9aeff283511c3acb06b3c1fcb5a
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
crypto/openssh/ssh.c
crypto/openssh/sshd.c
crypto/openssh/version.h