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

1 files changed, 6 insertions, 1 deletions

diff --git a/readconf.c b/readconf.c
index 66fb0d2bb..c046e4dbf 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);