summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-add.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2019-10-31 21:19:14 +0000
committerdjm <djm@openbsd.org>2019-10-31 21:19:14 +0000
commit24952783f4ecf27d0d87b5fd64ee8540ef199f5a (patch)
treefb83d9d0e7d4edc32805cffa83878cee680a10c9 /usr.bin/ssh/ssh-add.c
parentssh client support for U2F/FIDO keys (diff)
downloadwireguard-openbsd-24952783f4ecf27d0d87b5fd64ee8540ef199f5a.tar.xz
wireguard-openbsd-24952783f4ecf27d0d87b5fd64ee8540ef199f5a.zip
add new agent key constraint for U2F/FIDO provider
feedback & ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
-rw-r--r--usr.bin/ssh/ssh-add.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index 5a4f6891f2e..2d26f01fc81 100644
--- a/usr.bin/ssh/ssh-add.c
+++ b/usr.bin/ssh/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.141 2019/09/06 05:23:55 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.142 2019/10/31 21:19:15 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -303,7 +303,7 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag)
}
if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
- lifetime, confirm, maxsign)) == 0) {
+ lifetime, confirm, maxsign, NULL)) == 0) {
ret = 0;
if (!qflag) {
fprintf(stderr, "Identity added: %s (%s)\n",
@@ -356,7 +356,7 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag)
sshkey_free(cert);
if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
- lifetime, confirm, maxsign)) != 0) {
+ lifetime, confirm, maxsign, NULL)) != 0) {
error("Certificate %s (%s) add failed: %s", certpath,
private->cert->key_id, ssh_err(r));
goto out;