diff options
| author |   djm <djm@openbsd.org> | 2019-12-13 19:09:10 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-12-13 19:09:10 +0000 |
| commit | 4852100a8107fd6df1ba08ea17696d3c031d25a2 (patch) | |
| tree | cc7e417615db584e67c9b8e6fa35a2269ffac8c1 /usr.bin/ssh/sshkey.c | |
| parent | occuring -> occurring (diff) | |
| download | wireguard-openbsd-4852100a8107fd6df1ba08ea17696d3c031d25a2.tar.xz wireguard-openbsd-4852100a8107fd6df1ba08ea17696d3c031d25a2.zip | |
use ssh-sk-helper for all security key signing operations
This extracts and refactors the client interface for ssh-sk-helper
from ssh-agent and generalises it for use by the other programs.
This means that most OpenSSH tools no longer need to link against
libfido2 or directly interact with /dev/uhid*
requested by, feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 3e4f1e87c20..69238a9e18c 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.96 2019/11/25 00:51:37 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.97 2019/12/13 19:09:10 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -2704,11 +2704,6 @@ sshkey_sign(struct sshkey *key, case KEY_ECDSA: r = ssh_ecdsa_sign(key, sigp, lenp, data, datalen, compat); break; - case KEY_ECDSA_SK_CERT: - case KEY_ECDSA_SK: - r = sshsk_sign(sk_provider, key, sigp, lenp, data, datalen, - compat); - break; case KEY_RSA_CERT: case KEY_RSA: r = ssh_rsa_sign(key, sigp, lenp, data, datalen, alg); @@ -2720,8 +2715,10 @@ sshkey_sign(struct sshkey *key, break; case KEY_ED25519_SK: case KEY_ED25519_SK_CERT: - r = sshsk_sign(sk_provider, key, sigp, lenp, data, datalen, - compat); + case KEY_ECDSA_SK_CERT: + case KEY_ECDSA_SK: + r = sshsk_sign(sk_provider, key, sigp, lenp, data, + datalen, compat); break; #ifdef WITH_XMSS case KEY_XMSS: |