summaryrefslogtreecommitdiff
path: root/ssh-add.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-11-14 21:27:29 +0000
committerDamien Miller <djm@mindrot.org>2019-11-15 09:57:30 +1100
commit6bff9521ab9a9f7396d635755c342b72373bb4f9 (patch)
treec434974d93c1b918b1a0ae045f421d247f75f391 /ssh-add.c
parent4f5e331cb8e11face3025aa6578662dde489c3ad (diff)
upstream: directly support U2F/FIDO2 security keys in OpenSSH by
linking against the (previously external) USB HID middleware. The dlopen() capability still exists for alternate middlewares, e.g. for Bluetooth, NFC and test/debugging. OpenBSD-Commit-ID: 14446cf170ac0351f0d4792ba0bca53024930069
Diffstat (limited to 'ssh-add.c')
-rw-r--r--ssh-add.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh-add.c b/ssh-add.c
index 696b156d5..d89ca41c4 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.144 2019/11/12 19:33:08 markus Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.145 2019/11/14 21:27:30 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
@@ -715,6 +715,11 @@ main(int argc, char **argv)
715 goto done; 715 goto done;
716 } 716 }
717 717
718#ifdef ENABLE_SK_INTERNAL
719 if (skprovider == NULL)
720 skprovider = "internal";
721#endif
722
718 argc -= optind; 723 argc -= optind;
719 argv += optind; 724 argv += optind;
720 if (Tflag) { 725 if (Tflag) {