dropbear: svr-runopts.c annotate

annotate svr-runopts.c @ 1404:e8f67918fdc9

when pointer, use NULL instead of 0

author	Francois Perrad <francois.perrad@gadz.org>
date	Fri, 02 Jun 2017 18:14:31 +0200
parents	750ec4ec4cbe
children	798854f62430 517c67cbcd31

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"
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	31 #include "ecdsa.h"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	33 svr_runopts svr_opts; /* GLOBAL */
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	34
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 static void printhelp(const char * progname);
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	36 static void addportandaddress(const char* spec);
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	37 static void loadhostkey(const char *keyfile, int fatal_duplicate);
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	38 static void addhostkey(const char *keyfile);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 static void printhelp(const char * progname) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41
716 af4ef98b8591 Add URL to usage text Matt Johnston <matt@ucc.asn.au> parents: 706 diff changeset	42 fprintf(stderr, "Dropbear server v%s https://matt.ucc.asn.au/dropbear/dropbear.html\n"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 "Usage: %s [options]\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 "-b bannerfile Display the contents of bannerfile"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 " before user login\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 " (default: none)\n"
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	47 "-r keyfile Specify hostkeys (repeatable)\n"
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	48 " defaults: \n"
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	49 #if DROPBEAR_DSS
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	50 " dss %s\n"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	52 #if DROPBEAR_RSA
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	53 " rsa %s\n"
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	54 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	55 #if DROPBEAR_ECDSA
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	56 " ecdsa %s\n"
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	57 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	58 #if DROPBEAR_DELAY_HOSTKEY
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	59 "-R Create hostkeys as required\n"
4 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 "-F Don't fork into background\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62 #ifdef DISABLE_SYSLOG
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 "(Syslog support not compiled in, using stderr)\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 #else
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65 "-E Log to stderr rather than syslog\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 #ifdef DO_MOTD
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 "-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	69 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 "-w Disallow root logins\n"
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	71 #if DROPBEAR_SVR_PASSWORD_AUTH \|\| DROPBEAR_SVR_PAM_AUTH
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72 "-s Disable password logins\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73 "-g Disable password logins for root\n"
692 c58a15983808 Allow configuring "allow blank password option" at runtime Paul Eggleton <paul.eggleton@linux.intel.com> parents: 671 diff changeset	74 "-B Allow blank password logins\n"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	76 #if DROPBEAR_SVR_LOCALTCPFWD
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 "-j Disable local port forwarding\n"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	79 #if DROPBEAR_SVR_REMOTETCPFWD
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80 "-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	81 "-a Allow connections to forwarded ports from any host\n"
1289 a23386821e9f Add -c <command> option to force a specific command Jeremy Kerr <jk@ozlabs.org> parents: 1210 diff changeset	82 "-c command Force executed command\n"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 #endif
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	84 "-p [address:]port\n"
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	85 " Listen on specified tcp port (and optionally address),\n"
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	86 " up to %d can be specified\n"
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	87 " (default port is %s if none specified)\n"
323 3bfbe95f9a14 Add -P pidfile patch from Swen Schillig Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	88 "-P PidFile Create pid file PidFile\n"
3bfbe95f9a14 Add -P pidfile patch from Swen Schillig Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	89 " (default %s)\n"
71 ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	90 #ifdef INETD_MODE
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	91 "-i Start for inetd\n"
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	92 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	93 "-W <receive_window_buffer> (default %d, larger may be faster, max 1MB)\n"
622 e27d7fb23376 Mention that the value is in seconds Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	94 "-K <keepalive> (0 is never, default %d, in seconds)\n"
e27d7fb23376 Mention that the value is in seconds Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	95 "-I <idle_timeout> (0 is never, default %d, in seconds)\n"
946 17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 876 diff changeset	96 "-V Version\n"
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	97 #if DEBUG_TRACE
510 b85507ade010 - Update manuals, include section on authorized_keys Matt Johnston <matt@ucc.asn.au> parents: 492 diff changeset	98 "-v verbose (compiled with DEBUG_TRACE)\n"
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	99 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 ,DROPBEAR_VERSION, progname,
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	101 #if DROPBEAR_DSS
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 DSS_PRIV_FILENAME,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	104 #if DROPBEAR_RSA
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 RSA_PRIV_FILENAME,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	107 #if DROPBEAR_ECDSA
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	108 ECDSA_PRIV_FILENAME,
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	109 #endif
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	110 DROPBEAR_MAX_PORTS, DROPBEAR_DEFPORT, DROPBEAR_PIDFILE,
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	111 DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE, DEFAULT_IDLE_TIMEOUT);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	114 void svr_getopts(int argc, char ** argv) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115
1164 8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	116 unsigned int i, j;
1404 e8f67918fdc9 when pointer, use NULL instead of 0 Francois Perrad <francois.perrad@gadz.org> parents: 1295 diff changeset	117 char ** next = NULL;
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	118 int nextisport = 0;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	119 char* recv_window_arg = NULL;
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	120 char* keepalive_arg = NULL;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	121 char* idle_timeout_arg = NULL;
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	122 char* keyfile = NULL;
1164 8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	123 char c;
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	124
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 /* see printhelp() for options */
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	127 svr_opts.bannerfile = NULL;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	128 svr_opts.banner = NULL;
1289 a23386821e9f Add -c <command> option to force a specific command Jeremy Kerr <jk@ozlabs.org> parents: 1210 diff changeset	129 svr_opts.forced_command = NULL;
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	130 svr_opts.forkbg = 1;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	131 svr_opts.norootlogin = 0;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	132 svr_opts.noauthpass = 0;
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	133 svr_opts.norootpass = 0;
692 c58a15983808 Allow configuring "allow blank password option" at runtime Paul Eggleton <paul.eggleton@linux.intel.com> parents: 671 diff changeset	134 svr_opts.allowblankpass = 0;
71 ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	135 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	136 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	137 svr_opts.hostkey = NULL;
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	138 svr_opts.delay_hostkey = 0;
323 3bfbe95f9a14 Add -P pidfile patch from Swen Schillig Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	139 svr_opts.pidfile = DROPBEAR_PIDFILE;
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	140 #if DROPBEAR_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	141 svr_opts.nolocaltcp = 0;
271 be18c7dd486e Fix up #ifdefs for tcp forwarding Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	142 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	143 #if DROPBEAR_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	144 svr_opts.noremotetcp = 0;
271 be18c7dd486e Fix up #ifdefs for tcp forwarding Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	145 #endif
996 47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 976 diff changeset	146
575 f9b5dc0cba61 - Disable compression for non-final multihops Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	147 #ifndef DISABLE_ZLIB
996 47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 976 diff changeset	148 opts.compress_mode = DROPBEAR_COMPRESS_DELAYED;
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 976 diff changeset	149 #endif
47643024fc90 Disable non-delayed zlib for server Matt Johnston <matt@ucc.asn.au> parents: 976 diff changeset	150
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 /* not yet
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	152 opts.ipv4 = 1;
f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	153 opts.ipv6 = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 #ifdef DO_MOTD
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	156 svr_opts.domotd = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	157 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	158 #ifndef DISABLE_SYSLOG
1210 64a50eac1030 Moved usingsyslog from svr_runopts to runopts. Konstantin Tokarev <ktokarev@smartlabs.tv> parents: 1197 diff changeset	159 opts.usingsyslog = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 #endif
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	161 opts.recv_window = DEFAULT_RECV_WINDOW;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	162 opts.keepalive_secs = DEFAULT_KEEPALIVE;
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	163 opts.idle_timeout_secs = DEFAULT_IDLE_TIMEOUT;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	164
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	165 #if DROPBEAR_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	166 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	167 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 for (i = 1; i < (unsigned int)argc; i++) {
1164 8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	170 if (argv[i][0] != '-' \|\| argv[i][1] == '\0')
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	171 dropbear_exit("Invalid argument: %s", argv[i]);
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	172
1164 8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	173 for (j = 1; (c = argv[i][j]) != '\0' && !next && !nextisport; j++) {
1153 67d8a904f5a9 don't silently ignore extra flag arguments Matt Johnston <matt@ucc.asn.au> parents: 996 diff changeset	174 switch (c) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 case 'b':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	176 next = &svr_opts.bannerfile;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 break;
1289 a23386821e9f Add -c <command> option to force a specific command Jeremy Kerr <jk@ozlabs.org> parents: 1210 diff changeset	178 case 'c':
a23386821e9f Add -c <command> option to force a specific command Jeremy Kerr <jk@ozlabs.org> parents: 1210 diff changeset	179 next = &svr_opts.forced_command;
a23386821e9f Add -c <command> option to force a specific command Jeremy Kerr <jk@ozlabs.org> parents: 1210 diff changeset	180 break;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181 case 'd':
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	182 case 'r':
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	183 next = &keyfile;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 break;
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	185 case 'R':
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	186 svr_opts.delay_hostkey = 1;
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	187 break;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188 case 'F':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	189 svr_opts.forkbg = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191 #ifndef DISABLE_SYSLOG
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 case 'E':
1210 64a50eac1030 Moved usingsyslog from svr_runopts to runopts. Konstantin Tokarev <ktokarev@smartlabs.tv> parents: 1197 diff changeset	193 opts.usingsyslog = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	196 #if DROPBEAR_SVR_LOCALTCPFWD
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197 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	198 svr_opts.nolocaltcp = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	201 #if DROPBEAR_SVR_REMOTETCPFWD
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 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	203 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	204 break;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	205 case 'a':
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	206 opts.listen_fwd_all = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 #endif
71 ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	209 #ifdef INETD_MODE
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	210 case 'i':
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	211 svr_opts.inetdmode = 1;
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	212 break;
ac96bc733e71 adding inetd mode back from 0.43 Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	213 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 case 'p':
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	215 nextisport = 1;
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	216 break;
323 3bfbe95f9a14 Add -P pidfile patch from Swen Schillig Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	217 case 'P':
3bfbe95f9a14 Add -P pidfile patch from Swen Schillig Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	218 next = &svr_opts.pidfile;
3bfbe95f9a14 Add -P pidfile patch from Swen Schillig Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	219 break;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	220 #ifdef DO_MOTD
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221 /* 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	222 case 'm':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	223 svr_opts.domotd = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 case 'w':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	227 svr_opts.norootlogin = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 break;
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	229 case 'W':
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	230 next = &recv_window_arg;
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	231 break;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	232 case 'K':
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	233 next = &keepalive_arg;
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	234 break;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	235 case 'I':
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	236 next = &idle_timeout_arg;
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	237 break;
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	238 #if DROPBEAR_SVR_PASSWORD_AUTH \|\| DROPBEAR_SVR_PAM_AUTH
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239 case 's':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	240 svr_opts.noauthpass = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242 case 'g':
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	243 svr_opts.norootpass = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244 break;
692 c58a15983808 Allow configuring "allow blank password option" at runtime Paul Eggleton <paul.eggleton@linux.intel.com> parents: 671 diff changeset	245 case 'B':
c58a15983808 Allow configuring "allow blank password option" at runtime Paul Eggleton <paul.eggleton@linux.intel.com> parents: 671 diff changeset	246 svr_opts.allowblankpass = 1;
c58a15983808 Allow configuring "allow blank password option" at runtime Paul Eggleton <paul.eggleton@linux.intel.com> parents: 671 diff changeset	247 break;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	249 case 'h':
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250 printhelp(argv[0]);
946 17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 876 diff changeset	251 exit(EXIT_SUCCESS);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 break;
442 d82a2a44c684 Add -u option to specify /dev/urandom instead Matt Johnston <matt@ucc.asn.au> parents: 435 diff changeset	253 case 'u':
446 2cd2edfa11ee Just use /dev/urandom since that's what everyone ends up using anyway. Matt Johnston <matt@ucc.asn.au> parents: 442 diff changeset	254 /* backwards compatibility with old urandom option */
442 d82a2a44c684 Add -u option to specify /dev/urandom instead Matt Johnston <matt@ucc.asn.au> parents: 435 diff changeset	255 break;
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	256 #if DEBUG_TRACE
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	257 case 'v':
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	258 debug_trace = 1;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	259 break;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 91 diff changeset	260 #endif
946 17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 876 diff changeset	261 case 'V':
948 f92eb625c48d - Don't use multichar constants since recent gcc complains Matt Johnston <matt@ucc.asn.au> parents: 946 diff changeset	262 print_version();
946 17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 876 diff changeset	263 exit(EXIT_SUCCESS);
17d874ae93a1 Add '-V' for version Matt Johnston <matt@ucc.asn.au> parents: 876 diff changeset	264 break;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	265 default:
1164 8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	266 fprintf(stderr, "Invalid option -%c\n", c);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267 printhelp(argv[0]);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 exit(EXIT_FAILURE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	270 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 }
1164 8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	272
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	273 if (!next && !nextisport)
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	274 continue;
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	275
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	276 if (c == '\0') {
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	277 i++;
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	278 j = 0;
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	279 if (!argv[i]) {
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	280 dropbear_exit("Missing argument");
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	281 }
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	282 }
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	283
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	284 if (nextisport) {
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	285 addportandaddress(&argv[i][j]);
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	286 nextisport = 0;
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	287 } else if (next) {
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	288 *next = &argv[i][j];
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	289 if (*next == NULL) {
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	290 dropbear_exit("Invalid null argument");
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	291 }
1404 e8f67918fdc9 when pointer, use NULL instead of 0 Francois Perrad <francois.perrad@gadz.org> parents: 1295 diff changeset	292 next = NULL;
1164 8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	293
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	294 if (keyfile) {
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	295 addhostkey(keyfile);
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	296 keyfile = NULL;
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	297 }
8b6cba298768 Enable bundling Guilhem Moulin <guilhem@fripost.org> parents: 1160 diff changeset	298 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	300
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 /* 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	302 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	303 svr_opts.ports[0] = m_strdup(DROPBEAR_DEFPORT);
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	304 svr_opts.addresses[0] = m_strdup(DROPBEAR_DEFADDRESS);
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	305 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	306 }
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	307
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	308 if (svr_opts.bannerfile) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309 struct stat buf;
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	310 if (stat(svr_opts.bannerfile, &buf) != 0) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	311 dropbear_exit("Error opening banner file '%s'",
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	312 svr_opts.bannerfile);
4 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
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 if (buf.st_size > MAX_BANNER_SIZE) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316 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	317 MAX_BANNER_SIZE);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	320 svr_opts.banner = buf_new(buf.st_size);
469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	321 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	322 dropbear_exit("Error reading banner file '%s'",
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	323 svr_opts.bannerfile);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 }
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	325 buf_setpos(svr_opts.banner, 0);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326 }
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	327
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	328 if (recv_window_arg) {
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	329 opts.recv_window = atol(recv_window_arg);
492 b956d6151600 Replace calls to strtoul() with a helper m_str_to_uint() Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	330 if (opts.recv_window == 0 \|\| opts.recv_window > MAX_RECV_WINDOW) {
449 3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	331 dropbear_exit("Bad recv window '%s'", recv_window_arg);
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	332 }
3e6c536bc023 Add -W <windowsize> argument and document it. Matt Johnston <matt@ucc.asn.au> parents: 446 diff changeset	333 }
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	334
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	335 if (keepalive_arg) {
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	336 unsigned int val;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	337 if (m_str_to_uint(keepalive_arg, &val) == DROPBEAR_FAILURE) {
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	338 dropbear_exit("Bad keepalive '%s'", keepalive_arg);
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	339 }
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	340 opts.keepalive_secs = val;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 449 diff changeset	341 }
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	342
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	343 if (idle_timeout_arg) {
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	344 unsigned int val;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	345 if (m_str_to_uint(idle_timeout_arg, &val) == DROPBEAR_FAILURE) {
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	346 dropbear_exit("Bad idle_timeout '%s'", idle_timeout_arg);
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	347 }
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	348 opts.idle_timeout_secs = val;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 510 diff changeset	349 }
1290 ee2ffa044c7e Add manpage and log for forced_command Matt Johnston <matt@ucc.asn.au> parents: 1289 diff changeset	350
ee2ffa044c7e Add manpage and log for forced_command Matt Johnston <matt@ucc.asn.au> parents: 1289 diff changeset	351 if (svr_opts.forced_command) {
ee2ffa044c7e Add manpage and log for forced_command Matt Johnston <matt@ucc.asn.au> parents: 1289 diff changeset	352 dropbear_log(LOG_INFO, "Forced command set to '%s'", svr_opts.forced_command);
ee2ffa044c7e Add manpage and log for forced_command Matt Johnston <matt@ucc.asn.au> parents: 1289 diff changeset	353 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	355
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	356 static void addportandaddress(const char* spec) {
86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	357 char spec_copy = NULL, myspec = NULL, port = NULL, address = NULL;
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	358
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	359 if (svr_opts.portcount < DROPBEAR_MAX_PORTS) {
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	360
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	361 /* We don't free it, it becomes part of the runopt state */
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	362 spec_copy = m_strdup(spec);
86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	363 myspec = spec_copy;
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	364
706 002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	365 if (myspec[0] == '[') {
002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	366 myspec++;
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	367 port = strchr(myspec, ']');
86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	368 if (!port) {
706 002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	369 /* Unmatched [ -> exit */
002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	370 dropbear_exit("Bad listen address");
002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	371 }
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	372 port[0] = '\0';
86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	373 port++;
86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	374 if (port[0] != ':') {
706 002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	375 /* Missing port -> exit */
002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	376 dropbear_exit("Missing port");
002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	377 }
002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	378 } else {
002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	379 /* search for ':', that separates address and port */
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	380 port = strrchr(myspec, ':');
706 002cf09827c0 Allow specifying server "-p" options with ipv6 bracket notation, Matt Johnston <matt@ucc.asn.au> parents: 692 diff changeset	381 }
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	382
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	383 if (!port) {
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	384 /* no ':' -> the whole string specifies just a port */
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	385 port = myspec;
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	386 } else {
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	387 /* Split the address/port */
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	388 port[0] = '\0';
86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	389 port++;
86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	390 address = myspec;
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	391 }
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	392
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	393 if (!address) {
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	394 /* no address given -> fill in the default address */
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	395 address = DROPBEAR_DEFADDRESS;
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	396 }
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	397
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	398 if (port[0] == '\0') {
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	399 /* empty port -> exit */
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	400 dropbear_exit("Bad port");
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	401 }
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	402 svr_opts.ports[svr_opts.portcount] = m_strdup(port);
86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	403 svr_opts.addresses[svr_opts.portcount] = m_strdup(address);
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	404 svr_opts.portcount++;
1197 86a9e0204c03 ports and addresses must be malloced to avoid segfault on exit Matt Johnston <matt@ucc.asn.au> parents: 1177 diff changeset	405 m_free(spec_copy);
434 0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	406 }
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	407 }
0aaaf68e97dc Add -p [address:]port option for binding to addresses, patch from Matt Johnston <matt@ucc.asn.au> parents: 271 diff changeset	408
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	409 static void disablekey(int type) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	410 int i;
802 4029d3432a4f Fix broken disablekey() Matt Johnston <matt@ucc.asn.au> parents: 795 diff changeset	411 TRACE(("Disabling key type %d", type))
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	412 for (i = 0; sshhostkey[i].name != NULL; i++) {
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	413 if (sshhostkey[i].val == type) {
802 4029d3432a4f Fix broken disablekey() Matt Johnston <matt@ucc.asn.au> parents: 795 diff changeset	414 sshhostkey[i].usable = 0;
47 4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	415 break;
4b53a43f0082 - client pubkey auth works Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	416 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	417 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	418 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	419
807 75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	420 static void loadhostkey_helper(const char name, void* src, void** dst, int fatal_duplicate) {
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	421 if (*dst) {
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	422 if (fatal_duplicate) {
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	423 dropbear_exit("Only one %s key can be specified", name);
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	424 }
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	425 } else {
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	426 dst = src;
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	427 *src = NULL;
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	428 }
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	429
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	430 }
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	431
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	432 /* Must be called after syslog/etc is working */
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	433 static void loadhostkey(const char *keyfile, int fatal_duplicate) {
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	434 sign_key * read_key = new_sign_key();
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	435 enum signkey_type type = DROPBEAR_SIGNKEY_ANY;
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	436 if (readhostkey(keyfile, read_key, &type) == DROPBEAR_FAILURE) {
976 964d41e3aeb2 Don't print "Failed loading hostkey" when -R delayed hostkey option is enabled Steven Honeyman <stevenhoneyman@gmail.com> parents: 948 diff changeset	437 if (!svr_opts.delay_hostkey) {
964d41e3aeb2 Don't print "Failed loading hostkey" when -R delayed hostkey option is enabled Steven Honeyman <stevenhoneyman@gmail.com> parents: 948 diff changeset	438 dropbear_log(LOG_WARNING, "Failed loading %s", keyfile);
964d41e3aeb2 Don't print "Failed loading hostkey" when -R delayed hostkey option is enabled Steven Honeyman <stevenhoneyman@gmail.com> parents: 948 diff changeset	439 }
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	440 }
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	441
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	442 #if DROPBEAR_RSA
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	443 if (type == DROPBEAR_SIGNKEY_RSA) {
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 847 diff changeset	444 loadhostkey_helper("RSA", (void)&read_key->rsakey, (void)&svr_opts.hostkey->rsakey, fatal_duplicate);
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	445 }
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	446 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	447
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	448 #if DROPBEAR_DSS
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	449 if (type == DROPBEAR_SIGNKEY_DSS) {
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 847 diff changeset	450 loadhostkey_helper("DSS", (void)&read_key->dsskey, (void)&svr_opts.hostkey->dsskey, fatal_duplicate);
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	451 }
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	452 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	454 #if DROPBEAR_ECDSA
750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	455 #if DROPBEAR_ECC_256
807 75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	456 if (type == DROPBEAR_SIGNKEY_ECDSA_NISTP256) {
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 847 diff changeset	457 loadhostkey_helper("ECDSA256", (void)&read_key->ecckey256, (void)&svr_opts.hostkey->ecckey256, fatal_duplicate);
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	458 }
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	459 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	460 #if DROPBEAR_ECC_384
807 75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	461 if (type == DROPBEAR_SIGNKEY_ECDSA_NISTP384) {
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 847 diff changeset	462 loadhostkey_helper("ECDSA384", (void)&read_key->ecckey384, (void)&svr_opts.hostkey->ecckey384, fatal_duplicate);
807 75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	463 }
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	464 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	465 #if DROPBEAR_ECC_521
807 75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	466 if (type == DROPBEAR_SIGNKEY_ECDSA_NISTP521) {
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 847 diff changeset	467 loadhostkey_helper("ECDSA521", (void)&read_key->ecckey521, (void)&svr_opts.hostkey->ecckey521, fatal_duplicate);
807 75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	468 }
75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 802 diff changeset	469 #endif
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 852 diff changeset	470 #endif /* DROPBEAR_ECDSA */
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	471 sign_key_free(read_key);
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	472 TRACE(("leave loadhostkey"))
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	473 }
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	474
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	475 static void addhostkey(const char *keyfile) {
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	476 if (svr_opts.num_hostkey_files >= MAX_HOSTKEYS) {
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	477 dropbear_exit("Too many hostkeys");
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	478 }
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	479 svr_opts.hostkey_files[svr_opts.num_hostkey_files] = m_strdup(keyfile);
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	480 svr_opts.num_hostkey_files++;
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	481 }
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	482
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	483 void load_all_hostkeys() {
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	484 int i;
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	485 int disable_unset_keys = 1;
873 17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	486 int any_keys = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	487
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	488 svr_opts.hostkey = new_sign_key();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	489
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	490 for (i = 0; i < svr_opts.num_hostkey_files; i++) {
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	491 char *hostkey_file = svr_opts.hostkey_files[i];
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	492 loadhostkey(hostkey_file, 1);
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	493 m_free(hostkey_file);
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	494 }
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	495
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	496 #if DROPBEAR_RSA
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	497 loadhostkey(RSA_PRIV_FILENAME, 0);
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	498 #endif
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	499
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	500 #if DROPBEAR_DSS
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	501 loadhostkey(DSS_PRIV_FILENAME, 0);
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	502 #endif
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	503
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	504 #if DROPBEAR_ECDSA
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	505 loadhostkey(ECDSA_PRIV_FILENAME, 0);
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	506 #endif
7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	507
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	508 #if DROPBEAR_DELAY_HOSTKEY
876 5bfce5dcd461 Fix disabling DSS key Matt Johnston <matt@ucc.asn.au> parents: 873 diff changeset	509 if (svr_opts.delay_hostkey) {
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	510 disable_unset_keys = 0;
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	511 }
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	512 #endif
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	513
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	514 #if DROPBEAR_RSA
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	515 if (disable_unset_keys && !svr_opts.hostkey->rsakey) {
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	516 disablekey(DROPBEAR_SIGNKEY_RSA);
876 5bfce5dcd461 Fix disabling DSS key Matt Johnston <matt@ucc.asn.au> parents: 873 diff changeset	517 } else {
873 17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	518 any_keys = 1;
17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	519 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	520 #endif
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	521
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	522 #if DROPBEAR_DSS
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	523 if (disable_unset_keys && !svr_opts.hostkey->dsskey) {
876 5bfce5dcd461 Fix disabling DSS key Matt Johnston <matt@ucc.asn.au> parents: 873 diff changeset	524 disablekey(DROPBEAR_SIGNKEY_DSS);
5bfce5dcd461 Fix disabling DSS key Matt Johnston <matt@ucc.asn.au> parents: 873 diff changeset	525 } else {
873 17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	526 any_keys = 1;
17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	527 }
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	528 #endif
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	529
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	530
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	531 #if DROPBEAR_ECDSA
750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	532 #if DROPBEAR_ECC_256
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	533 if ((disable_unset_keys \|\| ECDSA_DEFAULT_SIZE != 256)
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	534 && !svr_opts.hostkey->ecckey256) {
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	535 disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256);
876 5bfce5dcd461 Fix disabling DSS key Matt Johnston <matt@ucc.asn.au> parents: 873 diff changeset	536 } else {
873 17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	537 any_keys = 1;
17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	538 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	539 #endif
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	540
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	541 #if DROPBEAR_ECC_384
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	542 if ((disable_unset_keys \|\| ECDSA_DEFAULT_SIZE != 384)
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	543 && !svr_opts.hostkey->ecckey384) {
795 7f604f9b3756 ecdsa is working Matt Johnston <matt@ucc.asn.au> parents: 716 diff changeset	544 disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384);
876 5bfce5dcd461 Fix disabling DSS key Matt Johnston <matt@ucc.asn.au> parents: 873 diff changeset	545 } else {
873 17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	546 any_keys = 1;
17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	547 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	548 #endif
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	549
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1290 diff changeset	550 #if DROPBEAR_ECC_521
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	551 if ((disable_unset_keys \|\| ECDSA_DEFAULT_SIZE != 521)
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	552 && !svr_opts.hostkey->ecckey521) {
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	553 disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP521);
876 5bfce5dcd461 Fix disabling DSS key Matt Johnston <matt@ucc.asn.au> parents: 873 diff changeset	554 } else {
873 17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	555 any_keys = 1;
17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	556 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	557 #endif
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	558 #endif /* DROPBEAR_ECDSA */
f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	559
876 5bfce5dcd461 Fix disabling DSS key Matt Johnston <matt@ucc.asn.au> parents: 873 diff changeset	560 if (!any_keys) {
1177 53751952ed95 mention dropbearkey too Matt Johnston <matt@ucc.asn.au> parents: 1176 diff changeset	561 dropbear_exit("No hostkeys available. 'dropbear -R' may be useful or run dropbearkey.");
873 17b15683648d Exit if we don't have keys and -R wasn't specified Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	562 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	563 }

Mercurial > dropbear

annotate svr-runopts.c @ 1404:e8f67918fdc9