Commit 9ff337aa authored by Matt Johnston's avatar Matt Johnston
Browse files

Exit if we don't have keys and -R wasn't specified

parent 441facc6
......@@ -452,6 +452,7 @@ static void addhostkey(const char *keyfile) {
void load_all_hostkeys() {
int i;
int disable_unset_keys = 1;
int any_keys = 0;
svr_opts.hostkey = new_sign_key();
......@@ -484,12 +485,20 @@ void load_all_hostkeys() {
if (disable_unset_keys && !svr_opts.hostkey->rsakey) {
disablekey(DROPBEAR_SIGNKEY_RSA);
}
else
{
any_keys = 1;
}
#endif
#ifdef DROPBEAR_DSS
if (disable_unset_keys && !svr_opts.hostkey->dsskey) {
disablekey(DROPBEAR_SIGNKEY_RSA);
}
else
{
any_keys = 1;
}
#endif
......@@ -499,6 +508,10 @@ void load_all_hostkeys() {
&& !svr_opts.hostkey->ecckey256) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256);
}
else
{
any_keys = 1;
}
#endif
#ifdef DROPBEAR_ECC_384
......@@ -506,6 +519,10 @@ void load_all_hostkeys() {
&& !svr_opts.hostkey->ecckey384) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384);
}
else
{
any_keys = 1;
}
#endif
#ifdef DROPBEAR_ECC_521
......@@ -513,7 +530,16 @@ void load_all_hostkeys() {
&& !svr_opts.hostkey->ecckey521) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP521);
}
else
{
any_keys = 1;
}
#endif
#endif /* DROPBEAR_ECDSA */
if (!any_keys)
{
dropbear_exit("No hostkeys available");
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment