From nobody Sun Apr 24 00:10:20 2022 X-Original-To: dev-commits-src-all@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 1BD211998A22; Sun, 24 Apr 2022 00:10:21 +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 4Km7nn0F7fz3hXP; Sun, 24 Apr 2022 00:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650759021; 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=en5vzx1D/mWcFiEaDNRnkPK2uuB8AwOiodKsS5vf92E=; b=OEolpWqGSm4/XK0RiFLqbje2mmHtGW8RLPhE72nMYEeC+o6v0Uz0UMC9Fk1l5ok1v2NHCX zrxr2dVlGMj85k4TesS3jX9YP7o/UjfIIEfIXTIf2mePEZ3bQvscoa5or/udWv6JQrcQNx PqxBGzErsN3gSXymUbMvox34eiOtQr26LUvdjCw1RpjpdC1GcESZflmVQhrp+Xhwo+O1Uc kT2FdGHM7E5eqBGS1j6AdIWlySMJNg1Bl2vOV1km/2CA9FKR0fJHhJ0ggZDXuQpWJr783N lLZvYhg02s0QKBDmAziIyzrn2BZ1FjaHSvaw6kEMSmnM+kOgHn2u1bGBDzheuQ== 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 D23521BB7E; Sun, 24 Apr 2022 00:10:20 +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 23O0AKK9038903; Sun, 24 Apr 2022 00:10:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23O0AKPD038896; Sun, 24 Apr 2022 00:10:20 GMT (envelope-from git) Date: Sun, 24 Apr 2022 00:10:20 GMT Message-Id: <202204240010.23O0AKPD038896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6e24fe61287b - main - ssh: use upstream SSH_OPENSSL_VERSION macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 6e24fe61287b02600be19042a6f6ce939aabfaa6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650759021; 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=en5vzx1D/mWcFiEaDNRnkPK2uuB8AwOiodKsS5vf92E=; b=mYMBF7oQqAOPV+bBvaANiWlPVvTYxYEvaZytzhK8X2XjE7oWtkAWOQRlbIiobJ36qi4cPv HepRqOq3MDIgG0MElxXQLpeae/UnnfCUlSgLUbkt3YrxkruKsw83XcRQcvi3q9+S5AuWXp hLrhWN/5b8PgZLjLGiswE1IsKRf5G2RxdWJP3OlqsCiBEjzltL15CBspe6BgLzzYxG30H1 oB1AINq2ktX14xcLGuvxLoPF4HUBOuI9o9HW8LUbSMSsTwjL8FFjqEGcU47B78TQ4b8Rzs Z18wNFQ6wJqAbRJy4s9pIMgxk6ZO2TOhIAYH6jwcsMal8Isb/KdTgyDQde7i6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650759021; a=rsa-sha256; cv=none; b=fqiiPmd5ouy2gOnqdPj5ExTux/n+hZo/BFZMO/KpC/ukhxbelZcojG3iCXuzlbjRkyfK2y 793cmvZYVP1C2q9vICNOXYyY5cyWpKFBLSbFPijoR8Y1uhVSjYHEmBdvEDeP/MLl4qh6Zh rvXb5VM4W9f5RKid12xuZtDq8RJrb/KAxApFj0fVItMJMGHKFm9fnDNLjvMVbCK3I5KpnB gVCoovRPys2R0XzqDx4XfLTKMr9RbA1uC4lVBs/NP1fnex3C78S9e6dnT6XTFeJ6ef3v5R CHvwktlJNjEHROi+utqz7NCVQxu/XFLjByy6BQzRhVzoY3l4kmXpRarZSSWZ3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6e24fe61287b02600be19042a6f6ce939aabfaa6 commit 6e24fe61287b02600be19042a6f6ce939aabfaa6 Author: Ed Maste AuthorDate: 2022-04-23 19:52:03 +0000 Commit: Ed Maste CommitDate: 2022-04-24 00:07:57 +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 --- 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 8a33b06bea88..860ad31954a0 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -876,10 +876,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; @@ -1147,7 +1147,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 c8a405a96ce5..50c8eabb18bb 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -923,10 +923,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 afebfdaeb591..f4800eaa05e8 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -6,9 +6,3 @@ #define SSH_RELEASE SSH_VERSION SSH_PORTABLE #define SSH_VERSION_FREEBSD "FreeBSD-20220415" - -#ifdef WITH_OPENSSL -#define OPENSSL_VERSION_STRING OpenSSL_version(OPENSSL_VERSION) -#else -#define OPENSSL_VERSION_STRING "without OpenSSL" -#endif