From nobody Wed Jun 21 05:42:27 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 4QmC7l57tNz4g2Dy; Wed, 21 Jun 2023 05:42:27 +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 4QmC7l2Hzvz3knX; Wed, 21 Jun 2023 05:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326147; 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=E3wH7dwY93O3hKqSejiNi8ymbKuwTc4DnSk7SGvLnXA=; b=J++EZrUVBNr/uc46N/39aM117b+3NnBDqiWHTuDROHKCH3Vpf7/aF4HF2HYleCEZ2if2XE Jzsof9t/nFSq3SD1DN1VkO9faLpqAx/HLsJioJL6izGcEWIX78XjtsfgDByBNzQjXED0sy y+j/oIBATprph+rf61Rc41OmHMPaUHVSwfAL8XM7eqXHCVTe9Ph9muoW9aPUTaPsVl0mn+ MQT6wEWdN8fag9liC6QqmQeOlcA7EiE0UhNxOn1YUG5xg7wirNGPyvtDtsG9RKUr40UaCl jq1WUwM3dybWFDokuwRiifn9ZdfjFIfGU61KNPD559pH0LYOOADoO4Bf4kmJgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687326147; 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=E3wH7dwY93O3hKqSejiNi8ymbKuwTc4DnSk7SGvLnXA=; b=Sp2wug4tnIuycszMuiVQj/nZfFMW1OqkUoZu4OTDBxmR06tQ2lbqD76RuEyih7QcslRPJw AFMAvLaZ2nOeCKX6PiaxxFGm8L7NULrcRQ7fbwXWyp2uj5xgiMACvTfSwriWTwadUOV+a0 X1uB18bTKGOdBBuTPvYn7PuvOyuYbkY6d/Vym8NFyAESiMo3YHXGQka/yInoojygDrAJqj /XIo+T8mfOjpeMGI2bcto5oFagtmKK75vibwwcVtffK7kaHZpUikHrsru8cgh455PuymDR 8ec5abEZKxRs9qsdRZzDcKM/NQZXFb895tnyuafEQujtQOFYgQgiV5dtNSRstQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687326147; a=rsa-sha256; cv=none; b=s5N9RKAzVB2z5gKenPcXEkVE2vfeR//YRRTixQoduQjnJOpNSG5T5cyY9aOWSUTP+TWAzT DxS7epLYBgOYljnqX0whR6pMZccmsMUWPwe4fiYcTl3WTR3so6opMkDkyvEZ1bYMkPgky3 OEmgqix+Z1U+kIDR0oxbMdjRuGsLP3SMVTdPqrMIyyRAig/tK8ddjjegd4p38086bf0zDp xYJl6KN2lc2J9KDvqdv6jDbvZ8e0m8JyFcZ7PuJS8jLNYAGJc1h4YwHdAEePOAmVfjq1lB 0T+JxSnplWwXIBtUFDNdN7PH105sX2XpEtLThqQUe/1t01L1vOS9Hr4jUYlZtw== 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 4QmC7l1DMJzV5n; Wed, 21 Jun 2023 05:42:27 +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 35L5gRBT064257; Wed, 21 Jun 2023 05:42:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L5gRYj064256; Wed, 21 Jun 2023 05:42:27 GMT (envelope-from git) Date: Wed, 21 Jun 2023 05:42:27 GMT Message-Id: <202306210542.35L5gRYj064256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: e374f1ec937f - releng/12.4 - 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: e374f1ec937f70ab2c89e0b392b45a67752c4172 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.4 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=e374f1ec937f70ab2c89e0b392b45a67752c4172 commit e374f1ec937f70ab2c89e0b392b45a67752c4172 Author: Ed Maste AuthorDate: 2023-06-05 14:49:53 +0000 Commit: Gordon Tetlow CommitDate: 2023-06-21 05:29:49 +0000 openssh: include destination constraints for smartcard keys From openssh-portable 54ac4ab2b53ce9fcb66b8250dee91c070e4167ed, OpenBSD-Commit-ID: add879fac6903a1cb1d1e42c4309e5359c3d870f PR: 271839 Sponsored by: The FreeBSD Foundation Approved by: so Security: FreeBSD-SA-23:05.openssh Security: CVE-2023-28531 (cherry picked from commit 2b4fb1350ceea0f2a0f04b1b8f5bfd3c32329ae4) --- 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) {