openwrtv4/package/network/services/dropbear/patches/610-skip-default-keys-in-custom-runs.patch

--- a/svr-runopts.c
+++ b/svr-runopts.c
@@ -505,6 +505,7 @@ void load_all_hostkeys() {
 		m_free(hostkey_file);
 	}
 
+	if (svr_opts.num_hostkey_files <= 0) {
 #ifdef DROPBEAR_RSA
 	loadhostkey(RSA_PRIV_FILENAME, 0);
 #endif
@@ -516,6 +517,7 @@ void load_all_hostkeys() {
 #ifdef DROPBEAR_ECDSA
 	loadhostkey(ECDSA_PRIV_FILENAME, 0);
 #endif
+	}
 
 #ifdef DROPBEAR_DELAY_HOSTKEY
 	if (svr_opts.delay_hostkey) {
Disable telnet in favor of passwordless SSH This enables passworldless login for root via SSH whenever no root password is set (e.g. after reset, flashing without keeping config or in failsafe) and removes telnet support alltogether. Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 46809 2015-09-07 19:29:25 +00:00			`--- a/svr-runopts.c`
			`+++ b/svr-runopts.c`
dropbear: server support option '-T' max auth tries Add support for '-T n' for a run-time specification for maximum number of authentication attempts where 'n' is between 1 and compile time option MAX_AUTH_TRIES. A default number of tries can be specified at compile time using 'DEFAULT_AUTH_TRIES' which itself defaults to MAX_AUTH_TRIES for backwards compatibility. Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> 2017-06-25 20:40:43 +00:00			`@@ -505,6 +505,7 @@ void load_all_hostkeys() {`
Disable telnet in favor of passwordless SSH This enables passworldless login for root via SSH whenever no root password is set (e.g. after reset, flashing without keeping config or in failsafe) and removes telnet support alltogether. Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 46809 2015-09-07 19:29:25 +00:00			`m_free(hostkey_file);`
			`}`

			`+ if (svr_opts.num_hostkey_files <= 0) {`
			`#ifdef DROPBEAR_RSA`
			`loadhostkey(RSA_PRIV_FILENAME, 0);`
			`#endif`
dropbear: server support option '-T' max auth tries Add support for '-T n' for a run-time specification for maximum number of authentication attempts where 'n' is between 1 and compile time option MAX_AUTH_TRIES. A default number of tries can be specified at compile time using 'DEFAULT_AUTH_TRIES' which itself defaults to MAX_AUTH_TRIES for backwards compatibility. Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> 2017-06-25 20:40:43 +00:00			`@@ -516,6 +517,7 @@ void load_all_hostkeys() {`
Disable telnet in favor of passwordless SSH This enables passworldless login for root via SSH whenever no root password is set (e.g. after reset, flashing without keeping config or in failsafe) and removes telnet support alltogether. Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 46809 2015-09-07 19:29:25 +00:00			`#ifdef DROPBEAR_ECDSA`
			`loadhostkey(ECDSA_PRIV_FILENAME, 0);`
			`#endif`
			`+ }`

			`#ifdef DROPBEAR_DELAY_HOSTKEY`
			`if (svr_opts.delay_hostkey) {`