# HG changeset patch # User Matt Johnston # Date 1642930179 -28800 # Node ID 8f28519e34b04b880dc281fe335597b916153316 # Parent 35d504d59c05378f217485bdcfb254067e5d01a6 Don't include sk keys at all in KEX list diff -r 35d504d59c05 -r 8f28519e34b0 common-algo.c --- a/common-algo.c Sat Jan 22 16:53:04 2022 +0300 +++ b/common-algo.c Sun Jan 23 17:29:39 2022 +0800 @@ -239,9 +239,6 @@ algo_type sigalgs[] = { #if DROPBEAR_ED25519 {"ssh-ed25519", DROPBEAR_SIGNATURE_ED25519, NULL, 1, NULL}, -#if DROPBEAR_SK_ED25519 - {"sk-ssh-ed25519@openssh.com", DROPBEAR_SIGNATURE_SK_ED25519, NULL, 1, NULL}, -#endif #endif #if DROPBEAR_ECDSA #if DROPBEAR_ECC_256 @@ -253,9 +250,6 @@ #if DROPBEAR_ECC_521 {"ecdsa-sha2-nistp521", DROPBEAR_SIGNATURE_ECDSA_NISTP521, NULL, 1, NULL}, #endif -#if DROPBEAR_SK_ECDSA - {"sk-ecdsa-sha2-nistp256@openssh.com", DROPBEAR_SIGNATURE_SK_ECDSA_NISTP256, NULL, 1, NULL}, -#endif #endif #if DROPBEAR_RSA #if DROPBEAR_RSA_SHA256 diff -r 35d504d59c05 -r 8f28519e34b0 svr-runopts.c --- a/svr-runopts.c Sat Jan 22 16:53:04 2022 +0300 +++ b/svr-runopts.c Sun Jan 23 17:29:39 2022 +0800 @@ -668,12 +668,6 @@ any_keys = 1; } #endif -#if DROPBEAR_SK_ECDSA - disablekey(DROPBEAR_SIGNKEY_SK_ECDSA_NISTP256); -#endif -#if DROPBEAR_SK_ED25519 - disablekey(DROPBEAR_SIGNKEY_SK_ED25519); -#endif if (!any_keys) { dropbear_exit("No hostkeys available. 'dropbear -R' may be useful or run dropbearkey.");