From nobody Thu Mar 2 17:43:40 2023 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 4PSJP914dNz3w4MJ; Thu, 2 Mar 2023 17:43:41 +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 4PSJP90ZkBz3HHb; Thu, 2 Mar 2023 17:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779021; 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=flbGUJoH4yQB+bMnXUyb9UwzoEwaB89QoCE4GBOYhv8=; b=osSFjUcLsTlbeG8VSV15nCMCbD89Xw+Kp00L2qpNbXNveSA4rMnS568/RGsFvhzJ1UG13t uDlPZ/aLvv0nx0Pijg1PokjMPtr3XWTButgfPTWs2Qfm1UU5cfXktfJwN/qY0D4NFxxD2A 8igsEl1L/6ngIYv7yMi7b19dz6hI4XpZwKMa1UinM7UeM8aMELH1ryFd6/2Wts4x3IP6NA EKYT7guyHXubcvoWaBuBpVO7GP5CPekS8TEkQXdsKATofDfCLDu6rdbLYeZfNjMOf/fUIA gHqEjDDXqljn2td+mhT+8cgCj6GgHMB6YvXJsaQ+YCiaXtxw1li/kDQaP7d7nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677779021; 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=flbGUJoH4yQB+bMnXUyb9UwzoEwaB89QoCE4GBOYhv8=; b=kBNwSiVDlIC7uCfIyMuLycSleppWjAUgY32Yh4anznfFS/jj/gwY+poChtBHLMSiu/AYHv wip/TqDJ4indoypQsQ+VaxLRGn4kFe/JcwhqgJlm46PBvnSdOT+pfvMBQYaFBlEj/ikmP8 AMR1S1VDhPA8iGF9+3A3mYAkcC74UF7O+wEdbucwYmuZEsMXwQ09iodupQcxCvApSuZTKT mlD9043o1QaApyhH/IjA61PHGc8uGCbwyOB6h8GTzMiPEHJ7M+z9EQeq1je2lkreFEE6aG 2x/H8EBwTtEdQJspzrLWXp7PWoRxktMjio6O35LMU78Ro1ir7oOZ/EiuwDSdsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677779021; a=rsa-sha256; cv=none; b=PUYYjiZXP3qrhJ7ogb39iWPYZr5m6PynfXuzKpoeI1633tKvL/I7ptA3SoTCW3sL+nr4Vb iv9YJgSNCmfo3P4dXZXZ4mI/yMye494WE4d7fhikCNZWtyWFbkmhpo6bqLV/HVu4m/7uzE oSs9RCtV5FhHfxoWKpk0t/Fu/Pp7AiVUjcuUCRW9eKm7ehU8zvKihEh2rb5fTOwSNOZidI BrBuIktV4vff0cNnNP1ai0GwEi+sFM7BL3HWzJNMt/q02C3/qqSiQR+moNr6zA8TRH5vht kBTMTjoM0YDCJUSFMRYqTSz/Sw/eaQd1Ly/Tjr4qP0qAN8ytuaUSuNBCvJiXqw== 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 4PSJP86RbvzPmD; Thu, 2 Mar 2023 17:43:40 +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 322HheoB084215; Thu, 2 Mar 2023 17:43:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322HheVv084214; Thu, 2 Mar 2023 17:43:40 GMT (envelope-from git) Date: Thu, 2 Mar 2023 17:43:40 GMT Message-Id: <202303021743.322HheVv084214@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: d54953d6abc9 - releng/13.2 - ssh: default VerifyHostKeyDNS to no, following upstream 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: d54953d6abc9b79d94c5bd4969864fa261e35ee8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d54953d6abc9b79d94c5bd4969864fa261e35ee8 commit d54953d6abc9b79d94c5bd4969864fa261e35ee8 Author: Ed Maste AuthorDate: 2023-02-17 01:26:41 +0000 Commit: Ed Maste CommitDate: 2023-03-02 17:43:28 +0000 ssh: default VerifyHostKeyDNS to no, following upstream Revert to upstream's default. Using VerifyHostKeyDNS may depend on a trusted nameserver and network path. This reverts commit 83c6a5242c80160fff76fb85454938761645b0c4. Reported by: David Leadbeater, G-Research Reviewed by: gordon Approved by: re (delphij) Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38648 (cherry picked from commit 41ff5ea22cb95deb9e7415510eb2f5f00b91537a) (cherry picked from commit 43fd77233cd49061839cfdd936cfeba53e9855c3) --- crypto/openssh/FREEBSD-upgrade | 1 - crypto/openssh/readconf.c | 6 ------ crypto/openssh/ssh_config | 1 - crypto/openssh/ssh_config.5 | 5 +---- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index c8603577a2a2..17161df93316 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -136,7 +136,6 @@ We've modified some configuration defaults in ssh: - CheckHostIP defaults to "no". - - VerifyHostKeyDNS defaults to "yes" if built with LDNS. - VersionAddendum defaults to "FreeBSD-YYYYMMDD". 3) Canonic host names diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 3440d05e4e3b..52c9c47c6879 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -2611,14 +2611,8 @@ fill_default_options(Options * options) options->rekey_limit = 0; if (options->rekey_interval == -1) options->rekey_interval = 0; -#if HAVE_LDNS - if (options->verify_host_key_dns == -1) - /* automatically trust a verified SSHFP record */ - options->verify_host_key_dns = 1; -#else if (options->verify_host_key_dns == -1) options->verify_host_key_dns = 0; -#endif if (options->server_alive_interval == -1) options->server_alive_interval = 0; if (options->server_alive_count_max == -1) diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index 7c7ad542e4ef..2dee303a128e 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -44,5 +44,4 @@ # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h # UserKnownHostsFile ~/.ssh/known_hosts.d/%k -# VerifyHostKeyDNS yes # VersionAddendum FreeBSD-20220415 diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index b642c5a6b17a..d783ea6ff835 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -1994,10 +1994,7 @@ need to confirm new host keys according to the .Cm StrictHostKeyChecking option. The default is -.Cm yes -if compiled with LDNS and -.Cm no -otherwise. +.Cm no . .Pp See also .Sx VERIFYING HOST KEYS