summaryrefslogtreecommitdiffstats
path: root/sshconnect.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-10-31 22:19:14 +0100
committerDamien Miller <djm@mindrot.org>2019-10-31 23:46:09 +0100
commitb9dd14d3091e31fb836f69873d3aa622eb7b4a1c (patch)
tree5bfc91dba85b8ab3522431cc123fd0da63f8ed9a /sshconnect.c
parentupstream: ssh client support for U2F/FIDO keys (diff)
downloadopenssh-b9dd14d3091e31fb836f69873d3aa622eb7b4a1c.tar.xz
openssh-b9dd14d3091e31fb836f69873d3aa622eb7b4a1c.zip
upstream: add new agent key constraint for U2F/FIDO provider
feedback & ok markus@ OpenBSD-Commit-ID: d880c380170704280b4003860a1744d286c7a172
Diffstat (limited to '')
-rw-r--r--sshconnect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 6230dad32..223074bd6 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.319 2019/09/13 04:31:19 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.320 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
@@ -1426,7 +1426,7 @@ maybe_add_key_to_agent(char *authfile, struct sshkey *private,
}
if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0,
- (options.add_keys_to_agent == 3), 0)) == 0)
+ (options.add_keys_to_agent == 3), 0, NULL)) == 0)
debug("identity added to agent: %s", authfile);
else
debug("could not add identity to agent: %s (%d)", authfile, r);