ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 02:46:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only advertise a single server ecdsa key when -R (generate as required) is

Browse Source 
specified. Fixes -R now that default ecdsa key size has changed.
This commit is contained in:
Matt Johnston 2018-03-08 22:25:33 +08:00
parent b4b11c8155
commit 56855744b8
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
svr-runopts.c
View File

@ -526,8 +526,10 @@ static void addhostkey(const char *keyfile) {
void load_all_hostkeys() { void load_all_hostkeys() {
int i; int i;
int disable_unset_keys = 1;
int any_keys = 0; int any_keys = 0;
#ifdef DROPBEAR_ECDSA
int loaded_any_ecdsa = 0;
#endif
svr_opts.hostkey = new_sign_key(); svr_opts.hostkey = new_sign_key();
@ -552,14 +554,8 @@ void load_all_hostkeys() {
#endif #endif
} }
#if DROPBEAR_DELAY_HOSTKEY
if (svr_opts.delay_hostkey) {
disable_unset_keys = 0;
}
#endif
#if DROPBEAR_RSA #if DROPBEAR_RSA
if (disable_unset_keys && !svr_opts.hostkey->rsakey) { if (!svr_opts.delay_hostkey && !svr_opts.hostkey->rsakey) {
disablekey(DROPBEAR_SIGNKEY_RSA); disablekey(DROPBEAR_SIGNKEY_RSA);
} else { } else {
any_keys = 1; any_keys = 1;
@ -567,39 +563,54 @@ void load_all_hostkeys() {
#endif #endif
#if DROPBEAR_DSS #if DROPBEAR_DSS
if (disable_unset_keys && !svr_opts.hostkey->dsskey) { if (!svr_opts.delay_hostkey && !svr_opts.hostkey->dsskey) {
disablekey(DROPBEAR_SIGNKEY_DSS); disablekey(DROPBEAR_SIGNKEY_DSS);
} else { } else {
any_keys = 1; any_keys = 1;
} }
#endif #endif
#if DROPBEAR_ECDSA #if DROPBEAR_ECDSA
/* We want to advertise a single ecdsa algorithm size.
- If there is a ecdsa hostkey at startup we choose that that size.
- If we generate at runtime we choose the default ecdsa size.
- Otherwise no ecdsa keys will be advertised */
/* check if any keys were loaded at startup */
loaded_any_ecdsa =
0
#if DROPBEAR_ECC_256 #if DROPBEAR_ECC_256
if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 256) || svr_opts.hostkey->ecckey256
&& !svr_opts.hostkey->ecckey256) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256);
} else {
any_keys = 1;
}
#endif #endif
#if DROPBEAR_ECC_384 #if DROPBEAR_ECC_384
if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 384) || svr_opts.hostkey->ecckey384
&& !svr_opts.hostkey->ecckey384) { #endif
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384); #if DROPBEAR_ECC_521
} else { || svr_opts.hostkey->ecckey521
any_keys = 1; #endif
;
any_keys |= loaded_any_ecdsa;
/* Or an ecdsa key could be generated at runtime */
any_keys |= svr_opts.delay_hostkey;
/* At most one ecdsa key size will be left enabled */
#if DROPBEAR_ECC_256
if (!svr_opts.hostkey->ecckey256
&& (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 256 )) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256);
}
#endif
#if DROPBEAR_ECC_384
if (!svr_opts.hostkey->ecckey384
&& (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 384 )) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384);
} }
#endif #endif
#if DROPBEAR_ECC_521 #if DROPBEAR_ECC_521
if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 521) if (!svr_opts.hostkey->ecckey521
&& !svr_opts.hostkey->ecckey521) { && (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 521 )) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP521); disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP521);
} else {
any_keys = 1;
} }
#endif #endif
#endif /* DROPBEAR_ECDSA */ #endif /* DROPBEAR_ECDSA */