From nobody Sun May 1 19:37:16 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BAD001AAF566; Sun, 1 May 2022 19:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KrxM04lSzz3jrt; Sun, 1 May 2022 19:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651433836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oz4l8OFsTpVHprrIcnu/K9rZ3IWmh3p+5SkPwFMJOZw=; b=AsL+GdXCGsmzLv7lJOcEEDs5VpesQtqGHMkz7ttCjhXKI0Xv++c9GLZsvwCOcZLJ0U7oAm hMoRCFgQfQedc46dE/Hltl3XxxMz3RFM4MPPwVoKQBP2OyndNAC0YS784os5YaPAiDQvq2 CXxxU/jtXzzRpY0/3tuZwu31n+utsyckXBQuwP5vmXNTIwM5qlhbMrrfkoS//fOthb2YCS b9HCFmNMOH1xNuUxsOlRUKgi3SdCUJfTcEgbEqLiHbhNu9STefCasic0sKTftmUSVsxBkx 6gerHUPzHTot75llV9Z7xa3hTuuXYQwEXGMoepceffVCCEfefDCVln1MPoIFJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7EB3D1BC0A; Sun, 1 May 2022 19:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 241JbGUf039490; Sun, 1 May 2022 19:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241JbGTJ039489; Sun, 1 May 2022 19:37:16 GMT (envelope-from git) Date: Sun, 1 May 2022 19:37:16 GMT Message-Id: <202205011937.241JbGTJ039489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: eb845555fd0a - stable/12 - ssh: use upstream SSH_OPENSSL_VERSION macro List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: eb845555fd0a678cc0916ce392444fe2f2a2ec10 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651433836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oz4l8OFsTpVHprrIcnu/K9rZ3IWmh3p+5SkPwFMJOZw=; b=hhQMbtTMv7VZ48KJvaL2KEgvQlTu/aeu8QTq7RaQ7ujcsFRY53shZTs65Q+z/0U0q3a0FQ ZUzJiZ+q31aWg83aidlD4Fv6JyCf0jY+PKWEhtau9fFi3AmluNNc3P2OaphHNL8IBVlvib VzfsHiTH8N96oVNG+hgFFncdwlCxfOaDZSc7BZduIUkNrMgwlO3J8lm2WE4uprNvlyS6Ki MXBdPGlOpGb0Mc64rp+2x6RmoaVwfm5agG/XFbBPiXELKDWwjIKVvCncdFBYLEgrIoFIj4 3VbSPZWHEPRhL3PZyE4v1mV60qFYGhZZo4AhaczPKOYFRanNmN78QaF6x4D9bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651433836; a=rsa-sha256; cv=none; b=Mw283AXvCl03iVrkDzypUDG0Q8sr6kBjA9hXUZOffLqBsAkOhm4IA8wzDgsr7YjSSGOKAx 0p4i1fKOsY/fdGov7OOfnRnASBhKCywRA4nfP3x2CfD397bWWNdT5CLBkCcAycaDnEE8Os OI2gb2ri+yzN0rjDznjCmzonVPiAdc6PB6T+d90nxrNfT4VtOdHvEHHYEDaA/K3SeNDOth LDB9gj+1B0+gHsigiwCgLnFdaAK6/cuEHp36gvk8DQXa4dbYVZcD1dJ7VhmNnmou08XfPJ kVYRAsfOTx6I8Q5oMZLrz2HPkA8OqbXqRkcMNYA3envYCT5IjE6Dg3CidH5BYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=eb845555fd0a678cc0916ce392444fe2f2a2ec10 commit eb845555fd0a678cc0916ce392444fe2f2a2ec10 Author: Ed Maste AuthorDate: 2022-04-23 19:52:03 +0000 Commit: Ed Maste CommitDate: 2022-05-01 19:37:10 +0000 ssh: use upstream SSH_OPENSSL_VERSION macro With the upgrade to OpenSSH 6.7p1 in commit a0ee8cc636cd we replaced WITH_OPENSSL ifdefs with an OPENSSL_VERSION macro, later changing it to OPENSSL_VERSION_STRING. A few years later OpenSSH made an equivalent change (with a different macro name), in commit 4d94b031ff88. Switch to the macro name they chose. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 6e24fe61287b02600be19042a6f6ce939aabfaa6) (cherry picked from commit 41406f9251c0e186fe820f70e9da0606bff71dae) --- crypto/openssh/ssh.c | 6 +++--- crypto/openssh/sshd.c | 4 ++-- crypto/openssh/version.h | 6 ------ 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index f01cb75e0237..99c532040558 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -877,10 +877,10 @@ main(int ac, char **av) *options.version_addendum != '\0') fprintf(stderr, "%s %s, %s\n", SSH_RELEASE, options.version_addendum, - OPENSSL_VERSION_STRING); + SSH_OPENSSL_VERSION); else fprintf(stderr, "%s, %s\n", SSH_RELEASE, - OPENSSL_VERSION_STRING); + SSH_OPENSSL_VERSION); if (opt == 'V') exit(0); break; @@ -1148,7 +1148,7 @@ main(int ac, char **av) if (debug_flag) /* version_addendum is always NULL at this point */ - logit("%s, %s", SSH_RELEASE, OPENSSL_VERSION_STRING); + logit("%s, %s", SSH_RELEASE, SSH_OPENSSL_VERSION); /* Parse the configuration files */ process_config_files(host_arg, pw, 0, &want_final_pass); diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index f2fa2c56625b..c4544137d5d7 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -928,10 +928,10 @@ usage(void) *options.version_addendum != '\0') fprintf(stderr, "%s %s, %s\n", SSH_RELEASE, - options.version_addendum, OPENSSL_VERSION_STRING); + options.version_addendum, SSH_OPENSSL_VERSION); else fprintf(stderr, "%s, %s\n", - SSH_RELEASE, OPENSSL_VERSION_STRING); + SSH_RELEASE, SSH_OPENSSL_VERSION); 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 ddbdbf778fe0..22ee862ab552 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -7,9 +7,3 @@ #define SSH_RELEASE SSH_VERSION SSH_PORTABLE #define SSH_VERSION_FREEBSD "FreeBSD-20211221" - -#ifdef WITH_OPENSSL -#define OPENSSL_VERSION_STRING OpenSSL_version(OPENSSL_VERSION) -#else -#define OPENSSL_VERSION_STRING "without OpenSSL" -#endif