Mercurial > dropbear
diff cli-runopts.c @ 682:4edea9f363d0
Add rough support for choosing ciphers/hashes with "-c" or "-m"
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 17 May 2012 00:12:42 +0800 |
| parents | 1291413c7c7e |
| children | aadfa8de977d |
line wrap: on
line diff
--- a/cli-runopts.c Wed May 09 22:52:58 2012 +0800 +++ b/cli-runopts.c Thu May 17 00:12:42 2012 +0800 @@ -86,6 +86,10 @@ #ifdef ENABLE_CLI_PROXYCMD "-J <proxy_program> Use program pipe rather than TCP connection\n" #endif +#ifdef ENABLE_USER_ALGO_LIST + "-c <cipher list> Specify preferred ciphers ('-c help' to list options)\n" + "-m <MAC list> Specify preferred MACs for packet verification (or '-m help')\n" +#endif #ifdef DEBUG_TRACE "-v verbose (compiled with DEBUG_TRACE)\n" #endif @@ -149,6 +153,10 @@ #ifndef DISABLE_ZLIB opts.enable_compress = 1; #endif +#ifdef ENABLE_USER_ALGO_LIST + opts.cipher_list = NULL; + opts.mac_list = NULL; +#endif /* not yet opts.ipv4 = 1; opts.ipv6 = 1; @@ -283,6 +291,14 @@ cli_opts.agent_fwd = 1; break; #endif +#ifdef ENABLE_USER_ALGO_LIST + case 'c': + next = &opts.cipher_list; + break; + case 'm': + next = &opts.mac_list; + break; +#endif #ifdef DEBUG_TRACE case 'v': debug_trace = 1; @@ -290,8 +306,10 @@ #endif case 'F': case 'e': +#ifndef ENABLE_USER_ALGO_LIST case 'c': case 'm': +#endif case 'D': #ifndef ENABLE_CLI_REMOTETCPFWD case 'R': @@ -351,6 +369,10 @@ /* And now a few sanity checks and setup */ +#ifdef ENABLE_USER_ALGO_LIST + parse_ciphers_macs(); +#endif + if (host_arg == NULL) { printhelp(); exit(EXIT_FAILURE);