Mercurial > dropbear

changeset 1856:8f28519e34b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't include sk keys at all in KEX list
author Matt Johnston <matt@ucc.asn.au>
date Sun, 23 Jan 2022 17:29:39 +0800
parents 35d504d59c05
children 6022df862942
files common-algo.c svr-runopts.c
diffstat 2 files changed, 0 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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
-	{"[email protected]", 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
-	{"[email protected]", DROPBEAR_SIGNATURE_SK_ECDSA_NISTP256, NULL, 1, NULL},
-#endif
 #endif
 #if DROPBEAR_RSA
 #if DROPBEAR_RSA_SHA256
--- 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.");