From nobody Mon Jun 05 16:03:31 2023 X-Original-To: dev-commits-src-branches@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 4QZdgl4vtqz4Z6yn; Mon, 5 Jun 2023 16:03:31 +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 4QZdgl4RjPz4LDC; Mon, 5 Jun 2023 16:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685981011; 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=+LW3CqbVshYpLDzP7HOjo41gkEVaoUwUiYuoVOxGOHs=; b=hfpRfJbMzc3pQNc1FVCe5zrDsnGa+PW5XUHHDH6sKVUr22Kx7AfO+7xGvrvrSwxiE+jjZR Qk4rJDrAxh893HVyuoiygfBhwixKxvq2Jl0paaka8BiCP+fPTx0zlTLrN+VK7OyrFaLors Z7kUT5m2bdLcYURWBTQEs/+ovbpUkmGDedlInwsz8rOREzCJIUZh83Qm/r21DHZkVxsZqX n85DzeW+JGvC+AjWJE4WiqRljc0AKq/fv8svLTLdc55mhs+QWMYMaIp0ye3X0CGk0tA13K f4fZuW7dYCYhIJc1bwVJKkmR9T2J2UkG+/HBwaKpvHcI4TQi7TRbl/0xPgQP7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685981011; 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=+LW3CqbVshYpLDzP7HOjo41gkEVaoUwUiYuoVOxGOHs=; b=dvDnEzDrLECyTU1T2aHv8WZ1ZXzDgV/JJydh2HRAkajM+Z5iz2qepz9DQcX9wMofaJrXcq Xb+3tmkfSGA3QmMyZmtFJy53zrftzKmZsML7CnR30jVs3a0X81hTM7VPW83istxtxfKHxJ aTmJ9+eRLO4wuN9FKhORjUPyS/hOChRIsV03BK/d3OgkfbSl/x7rwOvpSrirrp0a1AU2zD /XbV+PfMr6hSEUlYJR7ykQdZtbw+mPtxcJ2XU1ZC0Yggow8zQGhw63sHqqqvHUJ8jxM+cl zY0vVSqVdc9jneWTHV5Pvlu+WR1xr/e3DjrR0ZYo6zxEbnpzM4gOc2sn5m3Wng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685981011; a=rsa-sha256; cv=none; b=hRN0fErgaBg1EoU0dQsCX22/TrWIfaKkaT1HratCPmcsSMi5l7oUvLwy3Qz8sC8ZjPYw3J lg+tB/5q9lFyEJ+sdK7p7aG3ao+T7ZOCmedGAYczP0KvzRjk6Kv3977RCQq/x8yGcPg94z oc6/KhPpMxV+vrmk1fl+BB+9Su+nEs5SF8vEjMNCyLRa+CI53k3ub0Lth7XFnHPfZtYfPc NAT+SFsEzmUAwJSkq4b0dBm6sHW8CfbvjRlfv66s5axKtxkRiyfCj2KRT6bnVit+Uq0QJi P5wrNuN7vozJedaW/dXm9yPpUSCkXYzc7YLQ9UY06cHoTBMu5p2xxzsHKhADIw== 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 4QZdgl3W4HztSZ; Mon, 5 Jun 2023 16:03:31 +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 355G3Vsk067057; Mon, 5 Jun 2023 16:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355G3VIQ067056; Mon, 5 Jun 2023 16:03:31 GMT (envelope-from git) Date: Mon, 5 Jun 2023 16:03:31 GMT Message-Id: <202306051603.355G3VIQ067056@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: 2b4fb1350cee - stable/12 - openssh: include destination constraints for smartcard keys List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 2b4fb1350ceea0f2a0f04b1b8f5bfd3c32329ae4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2b4fb1350ceea0f2a0f04b1b8f5bfd3c32329ae4 commit 2b4fb1350ceea0f2a0f04b1b8f5bfd3c32329ae4 Author: Ed Maste AuthorDate: 2023-06-05 14:49:53 +0000 Commit: Ed Maste CommitDate: 2023-06-05 14:56:23 +0000 openssh: include destination constraints for smartcard keys From openssh-portable 54ac4ab2b53ce9fcb66b8250dee91c070e4167ed, OpenBSD-Commit-ID: add879fac6903a1cb1d1e42c4309e5359c3d870f PR: 271839 Sponsored by: The FreeBSD Foundation --- crypto/openssh/authfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssh/authfd.c b/crypto/openssh/authfd.c index b633e35eaf8b..b9ae505ad7b2 100644 --- a/crypto/openssh/authfd.c +++ b/crypto/openssh/authfd.c @@ -666,7 +666,7 @@ ssh_update_card(int sock, int add, const char *reader_id, const char *pin, struct dest_constraint **dest_constraints, size_t ndest_constraints) { struct sshbuf *msg; - int r, constrained = (life || confirm); + int r, constrained = (life || confirm || dest_constraints); u_char type; if (add) {