From nobody Sun May 01 19:37:07 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 688231AAF1A0; Sun, 1 May 2022 19:37:07 +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 4KrxLq2Tqcz3jjW; Sun, 1 May 2022 19:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651433827; 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=njeTcFBs+QYyWZacjVG90VvN7mCPHhHHhNGs0k7UNuI=; b=vECIT0P4Xr5dhQQeseeB5QjDky56y6wqTUs8EtPg5XabTRGF/cu9mF7g0oalSuvl3a6yV0 OgvPU0f0jvCsVoJKEnQ/KvKeqTmI5FR1CjH5ObGe0qsm2/LJwA/cBxsg30U2t/TeWw/2Ks OqkTzqZwGnWNLtuKWDwAr32JxNUHPYwqCQ3/EhtxuoHzJtlcZqf6QOaEkPYpf+8AKxcgNU gppKHSIU6fimCdgdKFSSRfWH8eEbEvG+bNoElGdf2NzoEz+QM9yk+O1v5/XIzUJQ3hZPz/ bh+NI7lMUr4zH05MZEkDUL5vUog9pT0orBoVaSk9hocIBZraPSrRArJmCpnDnA== 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 269061B6BF; Sun, 1 May 2022 19:37:07 +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 241Jb7V1039363; Sun, 1 May 2022 19:37:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241Jb7mJ039362; Sun, 1 May 2022 19:37:07 GMT (envelope-from git) Date: Sun, 1 May 2022 19:37:07 GMT Message-Id: <202205011937.241Jb7mJ039362@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: ae91d937e2cb - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: ae91d937e2cb94e34a5d3d78f0e740eca9f3a634 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651433827; 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=njeTcFBs+QYyWZacjVG90VvN7mCPHhHHhNGs0k7UNuI=; b=JOWcAYhNOSp0OLI5yEJtp2cugfv5byS/gzQGk3R6w357TIQ9FqGOuDJY9l7VScKYXCg6zU 9lM5hVR611Nw37OgUx1/Wczttbb5q/3O7+s7/IkWY0AUtVYbHsxNq6jr+BGVTW9e9jEAMM KWlMdKcLD4Nbt1rI7HKVgZBnRYu7hI75JXzPWCihFd0v4NSvaQkQKq/oRwRcyhwR6u/RC6 /TuR/vStdKq7OEOiDbnO56eo6B39vJVI1bKYMumJe0t2ElyQe/sioHsNTjgcNnRmMT2usp MCGPtx/KL+XVDwBh5iP7rd75rbQha6a9VTptCUURV9Opw5oym9fQGACmLRi0lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651433827; a=rsa-sha256; cv=none; b=pnTNiC+KhY80DAjjJ4uvysu5iI0ylGEm1Pz0+I0UiBm9WmhMO7TKQVf0SW7ixwqu+JSKiW LnK6Z4/ETJMGJGQH0lGqFDHydwgbIvkM2l22bblcrPOKqw7bYNxAVyqL3e+Y0v+E8pMKpf RLgE4KnR0ydvlLkyYzV/yVdHlo58/WE3ILDmmeqRApj2EBl3VW38tPgJkTbQZJZdmUuvYz nK3LPDtvf+5HdUxcb9jTaBRLxPogMYekBi1kVGwtZcMT31CgAf3bGogWfKrQijLtDOWyW2 dF0BDP72vdLdB8VeOl6MSzdYQUlMpuygv45pwpoJoo67A0jh5K3Wg57kt/tZCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ae91d937e2cb94e34a5d3d78f0e740eca9f3a634 commit ae91d937e2cb94e34a5d3d78f0e740eca9f3a634 Author: Ed Maste AuthorDate: 2022-04-23 19:52:03 +0000 Commit: Ed Maste CommitDate: 2022-05-01 19:36:59 +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) --- 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