[openssh-commits] [openssh] 10/14: upstream: ssh AddKeysToAgent support for U2F/FIDO keys

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit eebec620c9519c4839d781c4d5b6082152998f82
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Thu Oct 31 21:20:38 2019 +0000

    upstream: ssh AddKeysToAgent support for U2F/FIDO keys
    
    feedback & ok markus@
    
    OpenBSD-Commit-ID: ac08e45c7f995fa71f8d661b3f582e38cc0a2f91
---
 sshconnect.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sshconnect.c b/sshconnect.c
index 223074bd..177775f6 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.320 2019/10/31 21:19:15 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.321 2019/10/31 21:20:38 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1409,6 +1409,7 @@ maybe_add_key_to_agent(char *authfile, struct sshkey *private,
     char *comment, char *passphrase)
 {
 	int auth_sock = -1, r;
+	const char *skprovider = NULL;
 
 	if (options.add_keys_to_agent == 0)
 		return;
@@ -1424,9 +1425,10 @@ maybe_add_key_to_agent(char *authfile, struct sshkey *private,
 		close(auth_sock);
 		return;
 	}
-
+	if (sshkey_type_plain(private->type) == KEY_ECDSA_SK)
+		skprovider = options.sk_provider;
 	if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0,
-	    (options.add_keys_to_agent == 3), 0, NULL)) == 0)
+	    (options.add_keys_to_agent == 3), 0, skprovider)) == 0)
 		debug("identity added to agent: %s", authfile);
 	else
 		debug("could not add identity to agent: %s (%d)", authfile, r);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.