From owner-dev-commits-src-all@freebsd.org Thu Sep 9 15:41:37 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 36CCD6726A2; Thu, 9 Sep 2021 15:41:37 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H53C46hZ1z3KkY; Thu, 9 Sep 2021 15:41:36 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from marvin.madpilot.net (host-79-53-52-60.retail.telecomitalia.it [79.53.52.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 2E5A52762A; Thu, 9 Sep 2021 15:41:36 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Subject: Re: git: 19261079b743 - main - openssh: update to OpenSSH v8.7p1 To: Kyle Evans Cc: Ed Maste , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202109080107.18817pdj030849@gitrepo.freebsd.org> <8309c83d-9dc2-d0bc-3985-b5d7a5c853f1@FreeBSD.org> From: Guido Falsi Message-ID: <3ded4f48-38d7-1caf-5fb3-8fc101e1519c@FreeBSD.org> Date: Thu, 9 Sep 2021 17:41:34 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Sep 2021 15:41:37 -0000 On 09/09/21 16:33, Kyle Evans wrote: > On Thu, Sep 9, 2021 at 6:24 AM Guido Falsi wrote: >> >> On 08/09/21 03:07, Ed Maste wrote: >>> The branch main has been updated by emaste: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=19261079b74319502c6ffa1249920079f0f69a72 >>> >>> commit 19261079b74319502c6ffa1249920079f0f69a72 >>> Merge: c5128c48df3c 66719ee573ac >>> Author: Ed Maste >>> AuthorDate: 2021-09-08 01:05:51 +0000 >>> Commit: Ed Maste >>> CommitDate: 2021-09-08 01:05:51 +0000 >>> >>> openssh: update to OpenSSH v8.7p1 >>> >>> Some notable changes, from upstream's release notes: >>> >>> - sshd(8): Remove support for obsolete "host/port" syntax. >>> - ssh(1): When prompting whether to record a new host key, accept the key >>> fingerprint as a synonym for "yes". >>> - ssh-keygen(1): when acting as a CA and signing certificates with an RSA >>> key, default to using the rsa-sha2-512 signature algorithm. >>> - ssh(1), sshd(8), ssh-keygen(1): this release removes the "ssh-rsa" >>> (RSA/SHA1) algorithm from those accepted for certificate signatures. >>> - ssh-sk-helper(8): this is a new binary. It is used by the FIDO/U2F >>> support to provide address-space isolation for token middleware >>> libraries (including the internal one). >>> - ssh(1): this release enables UpdateHostkeys by default subject to some >>> conservative preconditions. >>> - scp(1): this release changes the behaviour of remote to remote copies >>> (e.g. "scp host-a:/path host-b:") to transfer through the local host >>> by default. >>> - scp(1): experimental support for transfers using the SFTP protocol as >>> a replacement for the venerable SCP/RCP protocol that it has >>> traditionally used. >>> >>> Additional integration work is needed to support FIDO/U2F in the base >>> system. >>> >>> Deprecation Notice >>> ------------------ >>> >>> OpenSSH will disable the ssh-rsa signature scheme by default in the >>> next release. >>> >>> Reviewed by: imp >>> MFC after: 1 month >>> Relnotes: Yes >>> Sponsored by: The FreeBSD Foundation >>> Differential Revision: https://reviews.freebsd.org/D29985 >>> >> >> While upgrading my current machines I encountered an issue with pam_ssh >> which seems to be caused by this update. >> >> I filed a bug report with all the details: >> >> https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258384 >> >> Could you take a look? >> >> Seems to be caused by the ssh code trying to call a function available >> only when FIDO/U2F support is enabled, which is not the case in our >> source base. >> >> I tried a quick fix by adding some ifdefs, but it failed to make it >> work, I'm still trying to find a solution myself. >> > > Looks like the reference in openssh/sshkey.c... probably the correct > thing to do is add ssh-sk.c to the secure/lib/libssh build; it still > requires additional integration for FIDO/U2F, though. > You suggestion is correct, but adding only ssh-sk.c solved the error, but unmassked more missing symbols, I ended up adding "ssh-sk.c ssh-ecdsa-sk.c ssh-ed25519-sk.c". Now things are back to normal for me. I attached a patch to the bug report [1], I don't have any U2F/FIDO hardware so I can't test that and, egoistically, don't need it, but this patch at least fixes the regression, so I think it should be committed to head. I can send the patch as a review if required. Thanks for your suggestion Kyle! [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=258384 -- Guido Falsi