summaryrefslogtreecommitdiff
path: root/ssh-add.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 /ssh-add.c
parent884416bdb10468f1252e4d7c13d51b43dccba7f6 (diff)
downloadopenssh-git-b9dd14d3091e31fb836f69873d3aa622eb7b4a1c.tar.gz
upstream: add new agent key constraint for U2F/FIDO provider
feedback & ok markus@ OpenBSD-Commit-ID: d880c380170704280b4003860a1744d286c7a172
Diffstat (limited to 'ssh-add.c')
-rw-r--r--ssh-add.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-add.c b/ssh-add.c
index ebfb8a32..2c65d027 100644
--- a/ssh-add.c
+++ b/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
@@ -311,7 +311,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",
@@ -364,7 +364,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;