diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-11-14 21:27:29 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-15 09:57:30 +1100 |
| commit | 6bff9521ab9a9f7396d635755c342b72373bb4f9 (patch) | |
| tree | c434974d93c1b918b1a0ae045f421d247f75f391 /ssh-keygen.c | |
| parent | 4f5e331cb8e11face3025aa6578662dde489c3ad (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-keygen.c')
| -rw-r--r-- | ssh-keygen.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 46d642e1..4cc70370 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.363 2019/11/12 22:36:44 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.364 2019/11/14 21:27:30 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -3071,6 +3071,11 @@ main(int argc, char **argv) } } +#ifdef ENABLE_SK_INTERNAL + if (sk_provider == NULL) + sk_provider = "internal"; +#endif + /* reinit */ log_init(argv[0], log_level, SYSLOG_FACILITY_USER, 1); |