From: djm <djm@openbsd.org>
Date: Sun, 19 Dec 2021 22:11:06 +0000 (+0000)
Subject: ssh-add side of destination constraints
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=eeca08d06b9f48d9532d37c3d43af4187927f194;p=openbsd

ssh-add side of destination constraints

Have ssh-add accept a list of "destination constraints" that allow
restricting where keys may be used in conjunction with a ssh-agent/ssh
that supports session ID/hostkey binding.

Constraints are specified as either "[user@]host-pattern" or
"host-pattern>[user@]host-pattern".

The first form permits a key to be used to authenticate as the
specified user to the specified host.

The second form permits a key that has previously been permitted
for use at a host to be available via a forwarded agent to an
additional host.

For example, constraining a key with "user1@host_a" and
"host_a>host_b". Would permit authentication as "user1" at
"host_a", and allow the key to be available on an agent forwarded
to "host_a" only for authentication to "host_b". The key would not
be visible on agent forwarded to other hosts or usable for
authentication there.

Internally, destination constraints use host keys to identify hosts.
The host patterns are used to obtain lists of host keys for that
destination that are communicated to the agent. The user/hostkeys are
encoded using a new restrict-destination-v00@openssh.com key
constraint.

host keys are looked up in the default client user/system known_hosts
files. It is possible to override this set on the command-line.

feedback Jann Horn & markus@
ok markus@
---

diff --git a/usr.bin/ssh/ssh-add/Makefile b/usr.bin/ssh/ssh-add/Makefile
index 6e9a2b45869..69b50f69902 100644
--- a/usr.bin/ssh/ssh-add/Makefile
+++ b/usr.bin/ssh/ssh-add/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.31 2020/04/03 02:26:56 djm Exp $
+#	$OpenBSD: Makefile,v 1.32 2021/12/19 22:11:06 djm Exp $
 
 .PATH:		${.CURDIR}/..
 
 SRCS=	ssh-add.c
-SRCS+=	authfd.c cleanup.c fatal.c readpass.c utf8.c
+SRCS+=	authfd.c cleanup.c fatal.c readpass.c utf8.c hostfile.c hmac.c
 SRCS+=	${SRCS_BASE} ${SRCS_KEY} ${SRCS_KEYP} ${SRCS_KRL} ${SRCS_UTL}
 SRCS+=	${SRCS_SK_CLIENT}