dropbear: svr-runopts.c annotate

annotate svr-runopts.c @ 312:24056a5eb75b ucc-axis-hack

serial works better. enable DSS.

author	matt-ucc@ucc.asn.au
date	Sun, 26 Mar 2006 13:05:31 +0000
parents	474c1a700b67
children

rev	line source
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 * Dropbear - a SSH2 server
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * Copyright (c) 2002,2003 Matt Johnston
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * All rights reserved.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * Permission is hereby granted, free of charge, to any person obtaining a copy
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 * of this software and associated documentation files (the "Software"), to deal
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * in the Software without restriction, including without limitation the rights
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * copies of the Software, and to permit persons to whom the Software is
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 * furnished to do so, subject to the following conditions:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * The above copyright notice and this permission notice shall be included in
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * all copies or substantial portions of the Software.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 * SOFTWARE. */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 #include "includes.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "runopts.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "signkey.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "buffer.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "dbutil.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "algo.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	32 svr_runopts svr_opts; /* GLOBAL */
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	33
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 static void printhelp(const char * progname);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 static void printhelp(const char * progname) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37
299 740e782679be Various changes to compile+kind of run on UCC's axis board. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	38 printf( "Dropbear sshd v%s\n"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39 "Usage: %s [options]\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 "Options are:\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41 "-b bannerfile Display the contents of bannerfile"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 " before user login\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 " (default: none)\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 #ifdef DROPBEAR_DSS
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 "-d dsskeyfile Use dsskeyfile for the dss host key\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 " (default: %s)\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 #ifdef DROPBEAR_RSA
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 "-r rsakeyfile Use rsakeyfile for the rsa host key\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 " (default: %s)\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 "-F Don't fork into background\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 #ifdef DISABLE_SYSLOG
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 "(Syslog support not compiled in, using stderr)\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 #else
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 "-E Log to stderr rather than syslog\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 #ifdef DO_MOTD
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 "-m Don't display the motd on login\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 "-w Disallow root logins\n"
121 9337c9f9a607 PAM improvements Matt Johnston <matt@ucc.asn.au> parents: 104 diff changeset	62 #if defined(ENABLE_SVR_PASSWORD_AUTH) \|\| defined(ENABLE_SVR_PAM_AUTH)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 "-s Disable password logins\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 "-g Disable password logins for root\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65 #endif
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	66 #ifdef ENABLE_SVR_LOCALTCPFWD
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 "-j Disable local port forwarding\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 #endif
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	69 #ifdef ENABLE_SVR_REMOTETCPFWD
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 "-k Disable remote port forwarding\n"
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	71 "-a Allow connections to forwarded ports from any host\n"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72 #endif
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	73 "-p port Listen on specified tcp port, up to %d can be specified\n"
104 298098b2a61e Default port is now set as a string Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	74 " (default %s if none specified)\n"
71 ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	75 #ifdef INETD_MODE
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	76 "-i Start for inetd\n"
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	77 #endif
309 474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	78 #ifdef INETD_SERVER_MODE
474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	79 "-x /path/to/binary Start in inetd server mode\n"
474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	80 #endif
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	81 #ifdef DEBUG_TRACE
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	82 "-v verbose\n"
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	83 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 ,DROPBEAR_VERSION, progname,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 #ifdef DROPBEAR_DSS
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 DSS_PRIV_FILENAME,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 #ifdef DROPBEAR_RSA
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 RSA_PRIV_FILENAME,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 #endif
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	91 DROPBEAR_MAX_PORTS, DROPBEAR_DEFPORT);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	94 void svr_getopts(int argc, char ** argv) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 unsigned int i;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 char ** next = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 /* see printhelp() for options */
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	100 svr_opts.rsakeyfile = NULL;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	101 svr_opts.dsskeyfile = NULL;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	102 svr_opts.bannerfile = NULL;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	103 svr_opts.banner = NULL;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	104 svr_opts.forkbg = 1;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	105 svr_opts.norootlogin = 0;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	106 svr_opts.noauthpass = 0;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	107 svr_opts.norootpass = 0;
71 ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	108 svr_opts.inetdmode = 0;
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	109 svr_opts.portcount = 0;
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	110 svr_opts.hostkey = NULL;
271 be18c7dd486e Fix up #ifdefs for tcp forwarding Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	111 #ifdef ENABLE_SVR_LOCALTCPFWD
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	112 svr_opts.nolocaltcp = 0;
271 be18c7dd486e Fix up #ifdefs for tcp forwarding Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	113 #endif
be18c7dd486e Fix up #ifdefs for tcp forwarding Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	114 #ifdef ENABLE_SVR_REMOTETCPFWD
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	115 svr_opts.noremotetcp = 0;
271 be18c7dd486e Fix up #ifdefs for tcp forwarding Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	116 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117 /* not yet
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	118 opts.ipv4 = 1;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	119 opts.ipv6 = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121 #ifdef DO_MOTD
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	122 svr_opts.domotd = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 #ifndef DISABLE_SYSLOG
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	125 svr_opts.usingsyslog = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 #endif
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	127 #ifdef ENABLE_SVR_REMOTETCPFWD
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	128 opts.listen_fwd_all = 0;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	129 #endif
309 474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	130 #ifdef INETD_SERVER_MODE
474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	131 svr_opts.inetd_dropbear_path = NULL;
474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	132 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 for (i = 1; i < (unsigned int)argc; i++) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 if (next) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 *next = argv[i];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 if (*next == NULL) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 dropbear_exit("Invalid null argument");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 next = 0x00;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141 continue;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 if (argv[i][0] == '-') {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 switch (argv[i][1]) {
309 474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	146 #ifdef INETD_SERVER_MODE
474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	147 case 'x':
474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	148 next = &svr_opts.inetd_dropbear_path;
474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	149 break;
474c1a700b67 add inetd server mode Matt Johnston <matt@ucc.asn.au> parents: 302 diff changeset	150 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 case 'b':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	152 next = &svr_opts.bannerfile;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154 #ifdef DROPBEAR_DSS
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 case 'd':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	156 next = &svr_opts.dsskeyfile;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	157 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	158 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159 #ifdef DROPBEAR_RSA
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 case 'r':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	161 next = &svr_opts.rsakeyfile;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 case 'F':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	165 svr_opts.forkbg = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167 #ifndef DISABLE_SYSLOG
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 case 'E':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	169 svr_opts.usingsyslog = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 #endif
271 be18c7dd486e Fix up #ifdefs for tcp forwarding Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	172 #ifdef ENABLE_SVR_LOCALTCPFWD
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 case 'j':
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	174 svr_opts.nolocaltcp = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 #endif
271 be18c7dd486e Fix up #ifdefs for tcp forwarding Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	177 #ifdef ENABLE_SVR_REMOTETCPFWD
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	178 case 'k':
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	179 svr_opts.noremotetcp = 1;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	180 break;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	181 case 'a':
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	182 opts.listen_fwd_all = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 #endif
71 ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	185 #ifdef INETD_MODE
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	186 case 'i':
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	187 svr_opts.inetdmode = 1;
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	188 break;
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	189 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 case 'p':
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	191 if (svr_opts.portcount < DROPBEAR_MAX_PORTS) {
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	192 svr_opts.ports[svr_opts.portcount] = NULL;
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	193 next = &svr_opts.ports[svr_opts.portcount];
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	194 /* Note: if it doesn't actually get set, we'll
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	195 * decrement it after the loop */
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	196 svr_opts.portcount++;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 #ifdef DO_MOTD
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 /* motd is displayed by default, -m turns it off */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201 case 'm':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	202 svr_opts.domotd = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 case 'w':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	206 svr_opts.norootlogin = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 break;
121 9337c9f9a607 PAM improvements Matt Johnston <matt@ucc.asn.au> parents: 104 diff changeset	208 #if defined(ENABLE_SVR_PASSWORD_AUTH) \|\| defined(ENABLE_SVR_PAM_AUTH)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 case 's':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	210 svr_opts.noauthpass = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	212 case 'g':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	213 svr_opts.norootpass = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 case 'h':
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217 printhelp(argv[0]);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218 exit(EXIT_FAILURE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219 break;
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	220 #ifdef DEBUG_TRACE
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	221 case 'v':
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	222 debug_trace = 1;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	223 break;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	224 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225 default:
299 740e782679be Various changes to compile+kind of run on UCC's axis board. Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	226 printf( "Unknown argument %s\n", argv[i]);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227 printhelp(argv[0]);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 exit(EXIT_FAILURE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	234 /* Set up listening ports */
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	235 if (svr_opts.portcount == 0) {
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	236 svr_opts.ports[0] = m_strdup(DROPBEAR_DEFPORT);
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	237 svr_opts.portcount = 1;
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	238 } else {
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	239 /* we may have been given a -p option but no argument to go with
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	240 * it */
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	241 if (svr_opts.ports[svr_opts.portcount-1] == NULL) {
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	242 svr_opts.portcount--;
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	243 }
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	244 }
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	245
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	246 if (svr_opts.dsskeyfile == NULL) {
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	247 svr_opts.dsskeyfile = DSS_PRIV_FILENAME;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248 }
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	249 if (svr_opts.rsakeyfile == NULL) {
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	250 svr_opts.rsakeyfile = RSA_PRIV_FILENAME;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	253 if (svr_opts.bannerfile) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	254 struct stat buf;
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	255 if (stat(svr_opts.bannerfile, &buf) != 0) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	256 dropbear_exit("Error opening banner file '%s'",
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	257 svr_opts.bannerfile);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	258 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260 if (buf.st_size > MAX_BANNER_SIZE) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261 dropbear_exit("Banner file too large, max is %d bytes",
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262 MAX_BANNER_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	263 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	265 svr_opts.banner = buf_new(buf.st_size);
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	266 if (buf_readfile(svr_opts.banner, svr_opts.bannerfile)!=DROPBEAR_SUCCESS) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267 dropbear_exit("Error reading banner file '%s'",
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	268 svr_opts.bannerfile);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269 }
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	270 buf_setpos(svr_opts.banner, 0);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	272
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	275 static void disablekey(int type, const char* filename) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	276
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 int i;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	279 for (i = 0; sshhostkey[i].name != NULL; i++) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	280 if (sshhostkey[i].val == type) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	281 sshhostkey[i].usable = 0;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	282 break;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	283 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284 }
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	285 dropbear_log(LOG_WARNING, "Failed reading '%s', disabling %s", filename,
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	286 type == DROPBEAR_SIGNKEY_DSS ? "DSS" : "RSA");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	289 /* Must be called after syslog/etc is working */
72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	290 void loadhostkeys() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	291
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	292 int ret;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	293 int type;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	294
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 121 diff changeset	295 TRACE(("enter loadhostkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	297 svr_opts.hostkey = new_sign_key();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	298
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299 #ifdef DROPBEAR_RSA
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	300 type = DROPBEAR_SIGNKEY_RSA;
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	301 ret = readhostkey(svr_opts.rsakeyfile, svr_opts.hostkey, &type);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	302 if (ret == DROPBEAR_FAILURE) {
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	303 disablekey(DROPBEAR_SIGNKEY_RSA, svr_opts.rsakeyfile);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	304 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	305 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	306 #ifdef DROPBEAR_DSS
91 dc68f7624f17 Stupid DSS hostkey bug fixed. Matt Johnston <matt@ucc.asn.au> parents: 71 diff changeset	307 type = DROPBEAR_SIGNKEY_DSS;
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	308 ret = readhostkey(svr_opts.dsskeyfile, svr_opts.hostkey, &type);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	309 if (ret == DROPBEAR_FAILURE) {
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	310 disablekey(DROPBEAR_SIGNKEY_DSS, svr_opts.dsskeyfile);
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	311 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	312 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	313
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 if ( 1
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 #ifdef DROPBEAR_DSS
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	316 && svr_opts.hostkey->dsskey == NULL
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318 #ifdef DROPBEAR_RSA
101 72dc22f56858 Change the way we load keys/ports so we don't print error messages into our Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	319 && svr_opts.hostkey->rsakey == NULL
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 ) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322 dropbear_exit("No hostkeys available");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 121 diff changeset	325 TRACE(("leave loadhostkeys"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326 }

Mercurial > dropbear

annotate svr-runopts.c @ 312:24056a5eb75b ucc-axis-hack