summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-10-31 21:19:14 +0000
committerDamien Miller <djm@mindrot.org>2019-11-01 09:46:09 +1100
commitb9dd14d3091e31fb836f69873d3aa622eb7b4a1c (patch)
tree5bfc91dba85b8ab3522431cc123fd0da63f8ed9a /sshconnect.c
parent884416bdb10468f1252e4d7c13d51b43dccba7f6 (diff)
upstream: add new agent key constraint for U2F/FIDO provider
feedback & ok markus@ OpenBSD-Commit-ID: d880c380170704280b4003860a1744d286c7a172
Diffstat (limited to 'sshconnect.c')
-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 @@
1/* $OpenBSD: sshconnect.c,v 1.319 2019/09/13 04:31:19 djm Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.320 2019/10/31 21:19:15 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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,
1426 } 1426 }
1427 1427
1428 if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0, 1428 if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0,
1429 (options.add_keys_to_agent == 3), 0)) == 0) 1429 (options.add_keys_to_agent == 3), 0, NULL)) == 0)
1430 debug("identity added to agent: %s", authfile); 1430 debug("identity added to agent: %s", authfile);
1431 else 1431 else
1432 debug("could not add identity to agent: %s (%d)", authfile, r); 1432 debug("could not add identity to agent: %s (%d)", authfile, r);