summaryrefslogtreecommitdiffstats
path: root/ssh-add.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2022-01-14 04:43:48 +0100
committerDamien Miller <djm@mindrot.org>2022-01-18 00:00:35 +0100
commit39d17e189f8e72c34c722579d8d4e701fa5132da (patch)
tree7395eb133f1c00f89539cf6ddf7a7916f932d0b1 /ssh-add.c
parentupstream: ssh-sk: free a resident key's user id (diff)
downloadopenssh-39d17e189f8e72c34c722579d8d4e701fa5132da.tar.xz
openssh-39d17e189f8e72c34c722579d8d4e701fa5132da.zip
upstream: allow pin-required FIDO keys to be added to ssh-agent(1).
ssh-askpass will be used to request the PIN at authentication time. From Pedro Martelletto, ok djm OpenBSD-Commit-ID: de8189fcd35b45f632484864523c1655550e2950
Diffstat (limited to 'ssh-add.c')
-rw-r--r--ssh-add.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/ssh-add.c b/ssh-add.c
index 4f2d70541..4a6f5e141 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.163 2021/12/22 06:56:41 jmc Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.164 2022/01/14 03:43:48 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -356,11 +356,6 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag,
"without provider\n", filename);
goto out;
}
- if ((private->sk_flags & SSH_SK_USER_VERIFICATION_REQD) != 0) {
- fprintf(stderr, "FIDO verify-required key %s is not "
- "currently supported by ssh-agent\n", filename);
- goto out;
- }
} else {
/* Don't send provider constraint for other keys */
skprovider = NULL;