Mercurial > dropbear

comparison common-algo.c @ 1902:4a6725ac957c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert "Don't include sk keys at all in KEX list" This reverts git commit f972813ecdc7bb981d25b5a63638bd158f1c8e72. The sk algorithms need to remain in the sigalgs list so that they are included in the server-sig-algs ext-info message sent by the server. RFC8308 for server-sig-algs requires that all algorithms are listed (though OpenSSH client 8.4p1 tested doesn't require that)
author Matt Johnston <matt@ucc.asn.au>
date Thu, 24 Mar 2022 13:42:08 +0800
parents 6cb6e81ca765
children 13cb8cc1b0e4
comparison
equal deleted inserted replaced
1901:4e36e3a95084 1902:4a6725ac957c
237 }; 237 };
238 238
239 algo_type sigalgs[] = { 239 algo_type sigalgs[] = {
240 #if DROPBEAR_ED25519 240 #if DROPBEAR_ED25519
241 {"ssh-ed25519", DROPBEAR_SIGNATURE_ED25519, NULL, 1, NULL}, 241 {"ssh-ed25519", DROPBEAR_SIGNATURE_ED25519, NULL, 1, NULL},
242 #if DROPBEAR_SK_ED25519
243 {"[email protected]", DROPBEAR_SIGNATURE_SK_ED25519, NULL, 1, NULL},
244 #endif
242 #endif 245 #endif
243 #if DROPBEAR_ECDSA 246 #if DROPBEAR_ECDSA
244 #if DROPBEAR_ECC_256 247 #if DROPBEAR_ECC_256
245 {"ecdsa-sha2-nistp256", DROPBEAR_SIGNATURE_ECDSA_NISTP256, NULL, 1, NULL}, 248 {"ecdsa-sha2-nistp256", DROPBEAR_SIGNATURE_ECDSA_NISTP256, NULL, 1, NULL},
246 #endif 249 #endif
247 #if DROPBEAR_ECC_384 250 #if DROPBEAR_ECC_384
248 {"ecdsa-sha2-nistp384", DROPBEAR_SIGNATURE_ECDSA_NISTP384, NULL, 1, NULL}, 251 {"ecdsa-sha2-nistp384", DROPBEAR_SIGNATURE_ECDSA_NISTP384, NULL, 1, NULL},
249 #endif 252 #endif
250 #if DROPBEAR_ECC_521 253 #if DROPBEAR_ECC_521
251 {"ecdsa-sha2-nistp521", DROPBEAR_SIGNATURE_ECDSA_NISTP521, NULL, 1, NULL}, 254 {"ecdsa-sha2-nistp521", DROPBEAR_SIGNATURE_ECDSA_NISTP521, NULL, 1, NULL},
255 #endif
256 #if DROPBEAR_SK_ECDSA
257 {"[email protected]", DROPBEAR_SIGNATURE_SK_ECDSA_NISTP256, NULL, 1, NULL},
252 #endif 258 #endif
253 #endif 259 #endif
254 #if DROPBEAR_RSA 260 #if DROPBEAR_RSA
255 #if DROPBEAR_RSA_SHA256 261 #if DROPBEAR_RSA_SHA256
256 {"rsa-sha2-256", DROPBEAR_SIGNATURE_RSA_SHA256, NULL, 1, NULL}, 262 {"rsa-sha2-256", DROPBEAR_SIGNATURE_RSA_SHA256, NULL, 1, NULL},