blob: e32baec83f7686d4b626bc0997dddf1994893a38 [file] [log] [blame]
CamVan Nguyenb6f7e102018-02-20 13:28:52 -06001From 95eff1ca0beea55259c2cdc7f1bb9f930bf57bc8 Mon Sep 17 00:00:00 2001
2From: CamVan Nguyen <ctnguyen@us.ibm.com>
3Date: Tue, 13 Feb 2018 15:37:47 -0600
4Subject: [PATCH 1/1] Only load dropbear default host keys if a key is not
5 specified
6
7---
8 svr-runopts.c | 10 +++++++---
9 1 file changed, 7 insertions(+), 3 deletions(-)
10
11diff --git a/svr-runopts.c b/svr-runopts.c
12index 8f60059..c5c2148 100644
13--- a/svr-runopts.c
14+++ b/svr-runopts.c
15@@ -488,17 +488,21 @@ void load_all_hostkeys() {
16 m_free(hostkey_file);
17 }
18
19+ /* Only load default host keys if a host key is not specified by the
20+ * user */
21+ if (0 == svr_opts.num_hostkey_files) {
22 #ifdef DROPBEAR_RSA
23- loadhostkey(RSA_PRIV_FILENAME, 0);
24+ loadhostkey(RSA_PRIV_FILENAME, 0);
25 #endif
26
27 #ifdef DROPBEAR_DSS
28- loadhostkey(DSS_PRIV_FILENAME, 0);
29+ loadhostkey(DSS_PRIV_FILENAME, 0);
30 #endif
31
32 #ifdef DROPBEAR_ECDSA
33- loadhostkey(ECDSA_PRIV_FILENAME, 0);
34+ loadhostkey(ECDSA_PRIV_FILENAME, 0);
35 #endif
36+ }
37
38 #ifdef DROPBEAR_DELAY_HOSTKEY
39 if (svr_opts.delay_hostkey) {
40--
411.8.2.2
42