ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-07 13:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix disabling DSS key

Browse Source
This commit is contained in:
Matt Johnston 2013-12-03 21:26:59 +08:00
parent b3cab3ce31
commit 092a4d9a7e
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
svr-runopts.c
View File

@ -475,8 +475,7 @@ void load_all_hostkeys() {
#endif #endif
#ifdef DROPBEAR_DELAY_HOSTKEY #ifdef DROPBEAR_DELAY_HOSTKEY
if (svr_opts.delay_hostkey) if (svr_opts.delay_hostkey) {
{
disable_unset_keys = 0; disable_unset_keys = 0;
} }
#endif #endif
@ -484,19 +483,15 @@ void load_all_hostkeys() {
#ifdef DROPBEAR_RSA #ifdef DROPBEAR_RSA
if (disable_unset_keys && !svr_opts.hostkey->rsakey) { if (disable_unset_keys && !svr_opts.hostkey->rsakey) {
disablekey(DROPBEAR_SIGNKEY_RSA); disablekey(DROPBEAR_SIGNKEY_RSA);
} } else {
else
{
any_keys = 1; any_keys = 1;
} }
#endif #endif
#ifdef DROPBEAR_DSS #ifdef DROPBEAR_DSS
if (disable_unset_keys && !svr_opts.hostkey->dsskey) { if (disable_unset_keys && !svr_opts.hostkey->dsskey) {
disablekey(DROPBEAR_SIGNKEY_RSA); disablekey(DROPBEAR_SIGNKEY_DSS);
} } else {
else
{
any_keys = 1; any_keys = 1;
} }
#endif #endif
@ -507,9 +502,7 @@ void load_all_hostkeys() {
if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 256) if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 256)
&& !svr_opts.hostkey->ecckey256) { && !svr_opts.hostkey->ecckey256) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256); disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256);
} } else {
else
{
any_keys = 1; any_keys = 1;
} }
#endif #endif
@ -518,9 +511,7 @@ void load_all_hostkeys() {
if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 384) if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 384)
&& !svr_opts.hostkey->ecckey384) { && !svr_opts.hostkey->ecckey384) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384); disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384);
} } else {
else
{
any_keys = 1; any_keys = 1;
} }
#endif #endif
@ -529,17 +520,13 @@ void load_all_hostkeys() {
if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 521) if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 521)
&& !svr_opts.hostkey->ecckey521) { && !svr_opts.hostkey->ecckey521) {
disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP521); disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP521);
} } else {
else
{
any_keys = 1; any_keys = 1;
} }
#endif #endif
#endif /* DROPBEAR_ECDSA */ #endif /* DROPBEAR_ECDSA */
if (!any_keys) if (!any_keys) {
{
dropbear_exit("No hostkeys available"); dropbear_exit("No hostkeys available");
} }
} }

2
svr-session.c
View File

@ -142,7 +142,7 @@ void svr_dropbear_exit(int exitcode, const char* format, va_list param) {
if (!sessinitdone) { if (!sessinitdone) {
/* before session init */ /* before session init */
snprintf(fmtbuf, sizeof(fmtbuf), snprintf(fmtbuf, sizeof(fmtbuf),
"Premature exit: %s", format); "Early exit: %s", format);
} else if (ses.authstate.authdone) { } else if (ses.authstate.authdone) {
/* user has authenticated */ /* user has authenticated */
snprintf(fmtbuf, sizeof(fmtbuf), snprintf(fmtbuf, sizeof(fmtbuf),