summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-add.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2019-11-14 21:27:29 +0000
committerdjm <djm@openbsd.org>2019-11-14 21:27:29 +0000
commit094c80e0a523faf92a99f63ea2e05353f5028597 (patch)
tree48717837ca6a597297dd012e7c471370a1282647 /usr.bin/ssh/ssh-add.c
parentincrease pipe size in order to exercise big pipe allocations (diff)
downloadwireguard-openbsd-094c80e0a523faf92a99f63ea2e05353f5028597.tar.xz
wireguard-openbsd-094c80e0a523faf92a99f63ea2e05353f5028597.zip
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.
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
-rw-r--r--usr.bin/ssh/ssh-add.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index 9a6e8b54c9e..4b821420d11 100644
--- a/usr.bin/ssh/ssh-add.c
+++ b/usr.bin/ssh/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.144 2019/11/12 19:33:08 markus Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.145 2019/11/14 21:27:30 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -707,6 +707,9 @@ main(int argc, char **argv)
goto done;
}
+ if (skprovider == NULL)
+ skprovider = "internal";
+
argc -= optind;
argv += optind;
if (Tflag) {