diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-10-31 21:19:14 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-01 09:46:09 +1100 |
commit | b9dd14d3091e31fb836f69873d3aa622eb7b4a1c (patch) | |
tree | 5bfc91dba85b8ab3522431cc123fd0da63f8ed9a /ssh-add.c | |
parent | 884416bdb10468f1252e4d7c13d51b43dccba7f6 (diff) |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-add.c,v 1.141 2019/09/06 05:23:55 djm Exp $ */ | 1 | /* $OpenBSD: ssh-add.c,v 1.142 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 |
@@ -311,7 +311,7 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag) | |||
311 | } | 311 | } |
312 | 312 | ||
313 | if ((r = ssh_add_identity_constrained(agent_fd, private, comment, | 313 | if ((r = ssh_add_identity_constrained(agent_fd, private, comment, |
314 | lifetime, confirm, maxsign)) == 0) { | 314 | lifetime, confirm, maxsign, NULL)) == 0) { |
315 | ret = 0; | 315 | ret = 0; |
316 | if (!qflag) { | 316 | if (!qflag) { |
317 | fprintf(stderr, "Identity added: %s (%s)\n", | 317 | fprintf(stderr, "Identity added: %s (%s)\n", |
@@ -364,7 +364,7 @@ add_file(int agent_fd, const char *filename, int key_only, int qflag) | |||
364 | sshkey_free(cert); | 364 | sshkey_free(cert); |
365 | 365 | ||
366 | if ((r = ssh_add_identity_constrained(agent_fd, private, comment, | 366 | if ((r = ssh_add_identity_constrained(agent_fd, private, comment, |
367 | lifetime, confirm, maxsign)) != 0) { | 367 | lifetime, confirm, maxsign, NULL)) != 0) { |
368 | error("Certificate %s (%s) add failed: %s", certpath, | 368 | error("Certificate %s (%s) add failed: %s", certpath, |
369 | private->cert->key_id, ssh_err(r)); | 369 | private->cert->key_id, ssh_err(r)); |
370 | goto out; | 370 | goto out; |