From nobody Mon Mar 18 14:20:26 2024 X-Original-To: dev-commits-src-main@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 4TyxpL6ByQz5Dpn3; Mon, 18 Mar 2024 14:20:26 +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 4TyxpL5jyxz4Qhd; Mon, 18 Mar 2024 14:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710771626; 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=88J5cQjLoyzaBOn6SnuFiaYYpgtulzdah+xq5/C5RhM=; b=XCVBatHtZOjfdAHKL4jdybv9fLDbZy/BIPFxmSzGzKgrQwncplCqf0MkzaRVBhvZw7tzt5 RKRZVy3zLO1ZfClbrhaapkNqmJXNBr0jpCpMzQnaVncfa4+9FeHf1fPCJvYq4gAGkKEUeg Ffctu1WCOjcOyFONbBkXABTvlWrrbX8yKimohS4Sy3/H2BgHBuahHIU/Xq2DcUVhQ8hW+P jLdDldbXlzC8dHbV01LN0VjVbcUATPwFtPbakenBTgImyWHU6k2HrtAIIYxkl5MEumwIeL 36Kq25KZOsm/b6xLGMgJJucLChmgJUTubro4XYaA6OFYESrKXLGWMgUo7KnCRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710771626; a=rsa-sha256; cv=none; b=ym/W3u/zYglYneuOYDBfUkNtgXQ4dB4bRmvX6f8EAUiL7Vx33l4yF9N7rHnxcuZljlJ1bn 6NN/2Y4vQ9848wCzfO9boBS6QCiwkkk1a+26ZRqwGxWi7+5qQQIjLxayX8ZhcTplNY/jKn gtbYM1ihlH2LL2DC5YFItR9pm1Nnve9QCcN2HccPHxUg7fH7JVN9n4KuMsYx/VFPGI5DOn IjonVromm5IiOdqxqnDJ/dZ9m652JF3BSLv8XdEsAJYtzs1nfdiqlLzoVlNYreIhR5TLII 0zybMC4U8WR+UBD8Z7aLhNHnZfKGXLrpTnHrQK2nm2HYcZIgUkVJmg6pBDIHgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710771626; 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=88J5cQjLoyzaBOn6SnuFiaYYpgtulzdah+xq5/C5RhM=; b=OwQqQvTaGyx3xdXHt/iNUegVeg1vcKJMFYPk4USfOR9CAtd7V3j4Dcv5CSotXcleMEcCfa mmHfNt/oGkj07Ai7ugCf6I+Cxw+tkZBnh7+10jHjVYoN6vgXkA+TEnt84GT09i8dxnzUE6 PDY4e3yQfpz8Odifjsc9Hd9xciIFWGTFIaY6EWcKcB/aVfkYoYfmRFuqKN4ZezZ4Wi96kL UpJRCTX1M/hQ8pOKjKszMxro6FZQFBZH2TjL+6vGOgt90bog78aR+Lw/KTlHmXxC7r8inq FH1g6C69DpXW3ZpxUcyXnjoacv+dV06lGlp+w+MrPl0RsxmA5TcvI/nhmjMZ5Q== 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 4TyxpL5KtjzR4Y; Mon, 18 Mar 2024 14:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IEKQIg041577; Mon, 18 Mar 2024 14:20:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEKQ6K041574; Mon, 18 Mar 2024 14:20:26 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:20:26 GMT Message-Id: <202403181420.42IEKQ6K041574@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: e600fc7295a7 - main - ssh: remove deprecated client VersionAddendum List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e600fc7295a7082041388113a5d677f6c4cf7ce7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e600fc7295a7082041388113a5d677f6c4cf7ce7 commit e600fc7295a7082041388113a5d677f6c4cf7ce7 Author: Ed Maste AuthorDate: 2024-03-18 14:15:27 +0000 Commit: Ed Maste CommitDate: 2024-03-18 14:20:18 +0000 ssh: remove deprecated client VersionAddendum Support for a client VersionAddendum was removed in bffe60ead024, but the option was retained (as oDeprecated) as a transition aid. Sufficient time has passed that it can be removed. Sponsored by: The FreeBSD Foundation --- crypto/openssh/FREEBSD-upgrade | 3 +-- crypto/openssh/readconf.c | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 2950731c7401..ef05c55a37e3 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -173,8 +173,7 @@ 10) Retired patches - We no longer have client-side VersionAddendum, but we recognize and ignore - the configuration options to avoid breaking existing configurations. + We no longer have client-side VersionAddendum. 11) PrintLastLog bugfix diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 20a769061a0d..3a64a0441641 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -330,9 +330,6 @@ static struct { { "obscurekeystroketiming", oObscureKeystrokeTiming }, { "channeltimeout", oChannelTimeout }, - /* Client VersionAddendum - retired in bffe60ead024 */ - { "versionaddendum", oDeprecated }, - { NULL, oBadOption } };