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, 8 insertions, 1 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index c62c263a6..4b6c44e90 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.242 2019/11/13 07:53:10 markus Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.243 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
@@ -299,6 +299,13 @@ provider_sign(const char *provider, struct sshkey *key,
         *sigp = NULL;
         *lenp = 0;
 
+#ifdef ENABLE_SK_INTERNAL
+        if (strcasecmp(provider, "internal") == 0) {
+                return sshsk_sign(provider, key, sigp, lenp,
+                    data, datalen, compat);
+        }
+#endif
+
         helper = getenv("SSH_SK_HELPER");
         if (helper == NULL || strlen(helper) == 0)
                 helper = _PATH_SSH_SK_HELPER;