Don't include sk keys at all in KEX list

This commit is contained in:
Matt Johnston 2022-01-23 17:29:39 +08:00
parent 5edd2ce32e
commit f972813ecd
2 changed files with 0 additions and 12 deletions

View File

@ -239,9 +239,6 @@ algo_type ssh_nocompress[] = {
algo_type sigalgs[] = { algo_type sigalgs[] = {
#if DROPBEAR_ED25519 #if DROPBEAR_ED25519
{"ssh-ed25519", DROPBEAR_SIGNATURE_ED25519, NULL, 1, NULL}, {"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 #endif
#if DROPBEAR_ECDSA #if DROPBEAR_ECDSA
#if DROPBEAR_ECC_256 #if DROPBEAR_ECC_256
@ -253,9 +250,6 @@ algo_type sigalgs[] = {
#if DROPBEAR_ECC_521 #if DROPBEAR_ECC_521
{"ecdsa-sha2-nistp521", DROPBEAR_SIGNATURE_ECDSA_NISTP521, NULL, 1, NULL}, {"ecdsa-sha2-nistp521", DROPBEAR_SIGNATURE_ECDSA_NISTP521, NULL, 1, NULL},
#endif #endif
#if DROPBEAR_SK_ECDSA
{"sk-ecdsa-sha2-nistp256@openssh.com", DROPBEAR_SIGNATURE_SK_ECDSA_NISTP256, NULL, 1, NULL},
#endif
#endif #endif
#if DROPBEAR_RSA #if DROPBEAR_RSA
#if DROPBEAR_RSA_SHA256 #if DROPBEAR_RSA_SHA256

View File

@ -668,12 +668,6 @@ void load_all_hostkeys() {
any_keys = 1; any_keys = 1;
} }
#endif #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) { if (!any_keys) {
dropbear_exit("No hostkeys available. 'dropbear -R' may be useful or run dropbearkey."); dropbear_exit("No hostkeys available. 'dropbear -R' may be useful or run dropbearkey.");