diff options
| author |   djm <djm@openbsd.org> | 2019-12-15 19:47:10 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-12-15 19:47:10 +0000 |
| commit | 7eaff8ccaad6dd0cccec52f7225443ced9e61663 (patch) | |
| tree | 345707b5019be17d0731a949fc282d0d9eceb99a | |
| parent | adapt to ssh-sk-client change (diff) | |
| download | wireguard-openbsd-7eaff8ccaad6dd0cccec52f7225443ced9e61663.tar.xz wireguard-openbsd-7eaff8ccaad6dd0cccec52f7225443ced9e61663.zip | |
allow ssh-keyscan to find security key hostkeys
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 1f52cf7aad1..2c7c28c8401 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.130 2019/09/06 05:23:55 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.131 2019/12/15 19:47:10 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -55,12 +55,14 @@ int ssh_port = SSH_DEFAULT_PORT; #define KT_ECDSA (1<<2) #define KT_ED25519 (1<<3) #define KT_XMSS (1<<4) +#define KT_ECDSA_SK (1<<5) +#define KT_ED25519_SK (1<<6) #define KT_MIN KT_DSA -#define KT_MAX KT_XMSS +#define KT_MAX KT_ED25519_SK int get_cert = 0; -int get_keytypes = KT_RSA|KT_ECDSA|KT_ED25519; +int get_keytypes = KT_RSA|KT_ECDSA|KT_ED25519|KT_ECDSA_SK|KT_ED25519_SK; int hash_hosts = 0; /* Hash hostname on output */ @@ -243,6 +245,16 @@ keygrab_ssh2(con *c) "ecdsa-sha2-nistp384," "ecdsa-sha2-nistp521"; break; + case KT_ECDSA_SK: + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ? + "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com" : + "sk-ecdsa-sha2-nistp256@openssh.com"; + break; + case KT_ED25519_SK: + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ? + "sk-ssh-ed25519-cert-v01@openssh.com" : + "sk-ssh-ed25519@openssh.com"; + break; default: fatal("unknown key type %d", c->c_keytype); break; @@ -715,6 +727,12 @@ main(int argc, char **argv) case KEY_XMSS: get_keytypes |= KT_XMSS; break; + case KEY_ED25519_SK: + get_keytypes |= KT_ED25519_SK; + break; + case KEY_ECDSA_SK: + get_keytypes |= KT_ECDSA_SK; + break; case KEY_UNSPEC: default: fatal("Unknown key type \"%s\"", tname); |