Mercurial > dropbear

changeset 873:17b15683648d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Exit if we don't have keys and -R wasn't specified
author Matt Johnston <matt@ucc.asn.au>
date Tue, 03 Dec 2013 20:59:03 +0800
parents a287954a16d6
children 68e2a0f6c1ef
files svr-runopts.c
diffstat 1 files changed, 26 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/svr-runopts.c	Tue Dec 03 00:06:35 2013 +0800
+++ b/svr-runopts.c	Tue Dec 03 20:59:03 2013 +0800
@@ -452,6 +452,7 @@
 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 @@
 	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 @@
 		&& !svr_opts.hostkey->ecckey256) {
 		disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256);
 	}
+	else
+	{
+		any_keys = 1;
+	}
 #endif
 
 #ifdef DROPBEAR_ECC_384
@@ -506,6 +519,10 @@
 		&& !svr_opts.hostkey->ecckey384) {
 		disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384);
 	}
+	else
+	{
+		any_keys = 1;
+	}
 #endif
 
 #ifdef DROPBEAR_ECC_521
@@ -513,7 +530,16 @@
 		&& !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");
+	}
+
 }