summaryrefslogtreecommitdiff
path: root/readconf.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 /readconf.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 'readconf.c')
-rw-r--r--readconf.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c
index 66fb0d2b..c046e4db 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.313 2019/11/13 05:42:26 deraadt Exp $ */
+/* $OpenBSD: readconf.c,v 1.314 2019/11/14 21:27:29 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2129,8 +2129,13 @@ fill_default_options(Options * options)
options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
if (options->update_hostkeys == -1)
options->update_hostkeys = 0;
+#ifdef ENABLE_SK_INTERNAL
+ if (options->sk_provider == NULL)
+ options->sk_provider = xstrdup("internal");
+#else
if (options->sk_provider == NULL)
options->sk_provider = xstrdup("$SSH_SK_PROVIDER");
+#endif
/* Expand KEX name lists */
all_cipher = cipher_alg_list(',', 0);