ChangeLog 442 KB
Newer Older
Niels Möller's avatar
Niels Möller committed
1 2
2012-07-12  Niels Möller  <nisse@lysator.liu.se>

3 4 5 6 7 8 9 10 11 12
	* src/algorithms.h (class algorithms_options): New attribute
	kex_algorithms.
	* src/algorithms.c (default_kex_algorithms): New function.
	(lookup_kex_algorithm): New function.
	(list_kex_algorithms): New function.
	(algorithms_options): Added --kex-algorithm.
	(init_algorithms_options): Initialize kex_algorithms.
	(algorithms_argp_parser): Handle --kex-algorithm, and default
	value. Use list_kex_algorithms for --list-algorithms.

Niels Möller's avatar
Niels Möller committed
13 14
	* doc/Makefile.in (.nroff.txt): Pass -Tutf8 to groff.

Niels Möller's avatar
Niels Möller committed
15 16
2012-07-10  Niels Möller  <nisse@lysator.liu.se>

17 18 19
	* src/testsuite/mini-inetd.c (usage): Take a FILE * as argument.
	Called with stdout in response to --help, and stderr otherwise.

Niels Möller's avatar
Niels Möller committed
20 21 22
	* src/testsuite/prgrp-timeout.c: Added missing include of
	config.h.

23 24 25 26 27 28 29
2012-07-08  Niels Möller  <nisse@lysator.liu.se>

	* src/testsuite/Makefile.in (TARGETS): Added tcpconnnect.

	* src/testsuite/tcpconnect.c: New file. Reimplemented the program
	with the same name in tcputils.

30 31 32 33 34
2012-06-19  Niels Möller  <nisse@lysator.liu.se>

	* src/transport.c (transport_process_packet): Disconnect on
	reception of an SSH_MSG_UNIMPLEMENTED message.

Niels Möller's avatar
Niels Möller committed
35 36
2012-02-03  Niels Möller  <nisse@lysator.liu.se>

37 38 39
	* doc/index.html: Updated to xhtml, and added charset declaration.
	Added git instructions.

Niels Möller's avatar
Niels Möller committed
40 41
	* doc/lsh.texinfo: Updated charset declaration.

Niels Möller's avatar
Niels Möller committed
42
2011-11-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
43 44 45 46 47

	* misc/run-tests (test_program): If EMULATOR is set in the
	environment, and the testprogram is not a script, use EMULATOR to
	run it. Typical use is EMULATUR=wine.

Niels Möller's avatar
Niels Möller committed
48
2011-09-21  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
49 50 51

	* src/Makefile.in (SOURCES): Added pidfile.c.

Niels Möller's avatar
Niels Möller committed
52
2011-09-07  Niels Möller  <nisse@lysator.liu.se>
53 54 55 56 57

	* config.guess: Upgraded to current version, timestamp 2011-08-20.
	Needed to recognize osx (darwin) on x86_64.
	* config.sub: Upgraded to current version, timestamp 2011-08-23.

Niels Möller's avatar
Niels Möller committed
58
2011-09-06  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
59 60 61 62 63 64 65 66 67 68 69

	* src/testsuite/Makefile.in (TS_SH): Added gateway-close-test.

	* src/gateway_channel.c (do_kill_gateway_channel): Arrange for the
	chained connection to be closed.
	(do_gateway_channel_event): Start by checking if the chained
	connection is alive. If it is not, we should only handle the
	CONFIRM event.

	* src/testsuite/gateway-close-test: New test case.

Niels Möller's avatar
Niels Möller committed
70
2011-09-05  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
71 72 73 74 75 76 77 78 79 80 81 82 83 84 85

	* src/testsuite/gateway-stop-test: Check that the pidfile is
	deleted (indicating that the process has cleaned up and exited
	like it should).

	* src/testsuite/functions.sh (test_result): Use --pid-file option
	to lsh. Check for existence of file before killing the process.

	* src/Makefile.in (PIDFILE_SOURCES): Arrange so that both lsh and
	lshd are linked with pidfile.o.

	* src/lsh.c (main_options): New option --pid-file.
	(main): Moved writing of pid to child process. For --pid-file, use
	make_pid_file_resource.

Niels Möller's avatar
Niels Möller committed
86
2011-09-02  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
87

Niels Möller's avatar
Niels Möller committed
88
	* src/.dist_classes: Added pidfile.c.x.
Niels Möller's avatar
Niels Möller committed
89
	* src/.dist_headers: Added pidfile.h.
Niels Möller's avatar
Niels Möller committed
90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109

	* src/daemon.c (daemon_pidfile): Deleted function. The
	functionality moved to pidfile.c.

	* src/lshd.c (main): make_pid_file_resource now also creates the
	file, so need to call daemon_pidfile.
	(make_pid_file_resource): Moved to src/pidfile.c
	(class pid_file_resource): Likewise.
	(do_kill_pid_file): Likewise.

	* src/Makefile.in (lshd_SOURCES): Added pidfile.c.

	* src/pidfile.h: New file.

	* src/pidfile.c: New file.
	(make_pid_file_resource): Moved function from lshd.c, and
	incorporate the writing of the file from daemon.c:daemon_pidfile.
	(class pid_file_resource): Moved from lshd.c.
	(do_kill_pid_file): Likewise.

Niels Möller's avatar
Niels Möller committed
110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128
	* src/testsuite/Makefile.in (TS_SH): Added gateway-stop-test.

	* src/testsuite/gateway-stop-test: New file.

	* src/testsuite/functions.sh (spawn_lsh): Check if pid-file exists
	before trying to kill the process.

	* src/lsh.c (main): Fixed --stop-gateway. Must read the hello
	message before we write the stop message.

	* src/gateway.c (kill_gateway_connection): Deleted loop to close
	channels.
	(gateway_packet_handler): When receiving LSH_GATEWAY_STOP message,
	call ssh_connection_pending_close to close the shared connection
	after all currently open channels are closed.

	* src/connection.c (ssh_connection_pending_close): Check
	channel_count, and kill connection immediately if zero.

Niels Möller's avatar
Niels Möller committed
129
2011-05-02  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
130 131 132 133

	* src/testsuite/serpent-test.c: Updated for correct serpent byte
	order.

Niels Möller's avatar
Niels Möller committed
134
2011-03-28  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
135 136 137 138

	* src/unix_random.c (random_init): Display errno when locking
	fails.

Niels Möller's avatar
Niels Möller committed
139
2011-03-23  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
140 141 142 143 144 145 146 147 148 149 150 151 152

	* doc/lsh.texinfo: Fixed "service ssh-userauth" and "service
	ssh-connection" examples.
	(Invoking lshd): Reviewed and updated.
	(Files and environment variables): Likewise.

	* src/lshd.c (lshd_options): New options --add-port,
	--add-interface and --no-syslog.
	(lshd_argp_parser): Implement them.

	* src/lshd-userauth.c (start_service): Pass on the
	LSHD_CONNECTION_CONF environment variable.

Niels Möller's avatar
Niels Möller committed
153
2011-02-21  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
154 155 156 157

	* src/lsh.c (parse_forward_arg): Support for optional brackets, to
	support IPv6 literal addresses.

Niels Möller's avatar
Niels Möller committed
158
2011-02-18  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
159

Niels Möller's avatar
Niels Möller committed
160 161 162
	* doc/Makefile.in (DISTFILES): Deleted srp-spec.txt, reverting
	change from 2011-02-10. It is already included, via $(TARGETS).

Niels Möller's avatar
Niels Möller committed
163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183
	* src/testsuite/Makefile.in (TS_SH): Added ipv4-test and
	ipv6-test.

	* src/testsuite/functions.sh (need_ipv6): New function.
	(LOCALHOST): New variable. Use it in all functions starting the
	lsh client.
	(at_connect): Use new --background option to mini-inetd, to
	improve robustness.

	* src/testsuite/tcpip-remote-test: Added a sleep call, to let the
	server side setup the port forwarding before we use it.

	* src/testsuite/mini-inetd.c (main): New --background option.

	* src/testsuite/ipv6-test: New file.
	* src/testsuite/ipv4-test: New file.

	* src/lshd.c (open_port): More info when getaddrinfo fails.
	(parse_interface): Allow optional brackets around ip address,
	needed for IPv6 literal addresses.

Niels Möller's avatar
Niels Möller committed
184
2011-02-14  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
185 186 187 188 189 190

	* src/testsuite/x11-3-test: Export DISPLAY before running
	exec_lsh.

	* src/testsuite/functions.sh (spawn_xvfb): Use rm -f.

Niels Möller's avatar
Niels Möller committed
191
2011-02-10  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
192 193 194 195

	* doc/Makefile.in (DISTFILES): Added srp-spec.txt, to avoid
	requiring groff.

Niels Möller's avatar
Niels Möller committed
196
2011-01-31  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
197 198 199 200 201 202 203 204 205

	* doc/lsh.texinfo (Server configuration): Describe all config options.

	* src/lshd-connection.c (main_argp_parser): Warn if shell, exec or
	subsystem requests are enabled, but session channels are disabled.

	* src/lshd-userauth.c (main_argp_parser): Add --helper-fd option
	to the default lshd-connection command line.

Niels Möller's avatar
Niels Möller committed
206
2011-01-07  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
207 208 209 210 211 212 213 214 215 216 217

	* src/lsh.c (OPT_HOST_DB_UPDATE): Rennamed, from...
	(OPT_CAPTURE_TO): ...old name.
	(main_argp_parser): For '-D' option, initialize socks_port.

	* src/lsh-transport.c (OPT_HOST_DB_UPDATE): Rennamed, from...
	(OPT_CAPTURE_TO): ...old name.

	* doc/lsh.texinfo (Hostauth options): Updated --host-db-update
	(used to be ---captured-to).

Niels Möller's avatar
Niels Möller committed
218
2010-12-14  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
219 220 221 222 223 224 225

	* doc/lsh.texinfo (Gateway options): New node.
	(Invoking lshg): Deleted node.

	* src/lsh.c (main_options): Moved gateway options to a new group,
	and updated the description of -G. Fixed --stop-gateway option.

Niels Möller's avatar
Niels Möller committed
226
2010-12-09  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
227 228 229 230

	* doc/lsh.texinfo (lshd basics): Rewrote node.
	(srp): Deleted node, and other references to SRP.

Niels Möller's avatar
Niels Möller committed
231
2010-11-17  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
232 233 234 235

	* misc/xenofarm.sh: Copy list of files in $pfx into result
	package.

Niels Möller's avatar
Niels Möller committed
236
2010-11-16  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
237 238 239

	* misc/xenofarm.sh: Improved crude gmp check to look for
	mpz_getlimbn.
Niels Möller's avatar
Niels Möller committed
240 241
	(cfgargs): Tweaked order for --with-include-path and
	--with-lib-path, to put $pfx before /usr/local.
Niels Möller's avatar
Niels Möller committed
242

Niels Möller's avatar
Niels Möller committed
243
2010-11-15  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
244

Niels Möller's avatar
Niels Möller committed
245 246 247 248
	* misc/xenofarm.sh (dotask): Display the correct status value when
	the step is skipped.
	(LIBGMPDIST): Initialize.

Niels Möller's avatar
Niels Möller committed
249 250 251 252 253 254 255 256
	* src/testsuite/Makefile.in (OTHER_SOURCES): Added getopt.c getopt1.c.
	(DISTFILES): Added getopt.h.
	(GETOPT_OBJS): New variable.
	(prgrp-timeout): Depend on and link with getopt files.
	(mini-inetd): Likewise.

	* .bootstrap: Link getopt files to the src/testsuite directory.

Niels Möller's avatar
Niels Möller committed
257 258 259 260
	* misc/xenofarm.sh: If a gmp dist is included in the build
	package, and gmp is not already installed on the system, install
	it in $pfx before trying to build lsh.

Niels Möller's avatar
Niels Möller committed
261 262 263
	* src/testsuite/mini-inetd.c: Include netinet/in.h, needed for
	IPPROTO_TCP on FreeBSD.

Niels Möller's avatar
Niels Möller committed
264 265 266 267 268 269 270 271 272 273 274
	* src/server_x11.c (do_kill_x11_listen_port): Close self->dir,
	even if lsh_pushd_fd fails.
	(open_x11_socket): Stop trying higher display numbers if bind
	fails with an error other then EADDRINUSE.

	* src/io.c (io_bind_sockaddr): Save and restore errno when
	returning failure.

	* src/server.c (service_config_option): Avoid using the
	non-standard strnlen function; plain strlen is good enough here.

Niels Möller's avatar
Niels Möller committed
275
2010-11-14  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
276

Niels Möller's avatar
Niels Möller committed
277
	* src/testsuite/Makefile.in (mini-inetd): Fixed typo with EXEEXT.
Niels Möller's avatar
Niels Möller committed
278

Niels Möller's avatar
Niels Möller committed
279 280 281 282
	* src/lshd-connection.c (make_lshd_connection): Warning message
	for attempt to enable features which were disabled at compile
	time.

Niels Möller's avatar
Niels Möller committed
283
2010-11-13  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330

	* src/testsuite/config/lshd-connection.conf: Use new config file
	options to enable all features.

	* src/lshd-connection.c (enum tcpforward_type): New enum.
	(class lshd_connection_config): Added attributes subsystem_config,
	allow_tcpforward, allow_session, allow_shell, allow_exec,
	allow_pty, allow_x11.
	(make_lshd_connection): Make all session and forwarding features
	configurable.
	(make_lshd_connection_config): Initialize new atttributes, and
	link to new lshd_connection_config_parser.
	(main_options): New command line options: --allow-tcpip-forward,
	--deny-tcpip-forward, --allow-session, --deny-session,
	--allow-shell, --deny-shell, --allow-exec, --deny-exec,
	--subsystem, and --add-subsystem.
	(CASE_FLAG): New macro.
	(main_argp_parser): Sanity check configuration at ARGP_KEY_END.
	Handle new command line options (see above).
	(lshd_connection_config_options): New list of config file options.
	(lshd_connection_config_handler): New function.
	(lshd_connection_config_parser): New config file parser.

	* src/server_session.c (class subsystem_request): Use
	service_config to represent subsystems.
	(quote_argument_length): New function.
	(quote_argument): New function.
	(subsystem_command_line): New function.
	(do_spawn_subsystem): Rewritten to use service_config_lookup and
	subsystem_command_line.
	(make_subsystem_handler): Changed argument type to const struct
	service_config *.

	* src/lshd-userauth.c (main): Use libexec_dir from the
	service_config class.
	(start_service): Propagate environment variable $LSHD_LIBEXEC_DIR.

	* src/lshd.c (lshd_service_request_handler): Use libexec_dir from
	the service_config class.

	* src/server.c (server_lookup_module): Deleted function.
	(make_service_config): Set libexec_dir, taking environment
	variable $LSHD_LIBEXEC_DIR into account.
	(service_config_lookup): Declare argument const.

	* src/server.h (class service_config): New attribute libexec_dir.

Niels Möller's avatar
Niels Möller committed
331
2010-11-12  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
332 333 334 335 336 337 338 339 340 341 342 343 344 345 346

	* src/lshd-userauth.c (main_options): Fixed double ':' in header.
	(class lshd_userauth_config): Deleted werror_config attribute;
	this class is already inherited.
	(make_lshd_userauth_config): Deleted initialization of
	werror_config attribute.
	(CASE_FLAG): New macro.
	(main_argp_parser): Use CASE_FLAG.
	(lshd_userauth_config_handler): Updated child state initialization
	to point to inherited werror config.
	(lshd_userauth_config_handler): Added missing break.
	(main): Use trace, not werror, for startup message.

	* src/lshd.c (lshd_config_handler): Added missing break.

Niels Möller's avatar
Niels Möller committed
347
2010-11-10  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393

	* src/lsh.c (parse_arg_unsigned): New argument with expected
	terminator.
	(parse_forward_arg): Return targret address on success. Don't
	modify the input string, using updated parse_arg_unsigned. Don't
	use io_lookup_address; names are resolved later.
	(main_argp_parser): Use make_string. Updated to parse_forward_arg
	changes. When setting up tcp forwarding, use "" to denote any
	address, and "localhost" to denote any local addresses.

	* src/lshd.c (make_lshd_port): Use io_bind_sockaddr.
	(open_port): Unconditionally set AI_PASSIVE.

	* src/server_tcpforward.c (make_server_forward): Use
	tcpforward_listen, replacing calls to make_tcpforward_listen_port
	and io_listen.
	* src/client_tcpforward.c (do_forward_local_port): Likewise.

	* src/socks.c (make_socks_listen_port): Rewritten, analogously to
	tcpforward_listen, below.
	(do_make_socks_server): Updated to use new make_socks_listen_port.

	* src/tcpforward.c (tcpforward_listen): New function, replacing
	make_tcpforward_listen_port. Does address lookups via
	io_getaddrinfo, and may bind multiple interfaces using IPv4 or
	IPv6. Trace message with each bound interface. Call io_listen, not
	just io_bind_sockaddr.
	(make_tcpforward_listen_port): Deleted.
	(class io_connect_state): New ttributes to keep track of list of
	addresses.
	(tcpforward_connect_error): Try next address, if available.
	(tcpforward_connect): Use io_getaddrinfo, and attempt connection
	to each address on the list.

	* src/io.c (io_getaddrinfo): New helper function.
	(io_make_sockaddr): Deleted function.
	(io_lookup_address): Deleted function.
	(io_bind_sockaddr): Set IPV6_V6ONLY. Report errors using werror.

	* src/server_x11.c (do_x11_listen_port_accept): Fixed error
	message.
	(open_x11_socket): Use make_string.

	* src/queue.h (class addr_queue): Deleted unused class.
	* src/queue.c: Deleted all addr_queue related functions.

Niels Möller's avatar
Niels Möller committed
394
2010-11-09  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
395 396 397 398 399 400 401 402 403 404 405 406 407 408 409

	* src/lshd-connection.c (oop_read_service): Use verbose, not
	werror, for message on EOF.
	(main): Use trace, not werror, for startup message.

	* src/lsh-decode-key.c (main_argp_parser): Use make_string.
	* src/lsh-keygen.c (main_argp_parser): Likewise.
	* src/srp-gen.c (srp_gen): Likewise.
	(main_argp_parser): Likewise.

	* src/testsuite/lshg-tcpip-remote-test: Deleted sleep.
	* src/testsuite/tcpip-remote-test: Likewise.

	* src/testsuite/lsh-encrypted-key-test: Reenabled test.

Niels Möller's avatar
Niels Möller committed
410
2010-11-08  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
411

Niels Möller's avatar
Niels Möller committed
412 413 414
	* src/testsuite/functions.sh (at_connect): Don't use -m flag to
	mini-inetd.

Niels Möller's avatar
Niels Möller committed
415 416 417
	* src/atoms.in: Deleted ssh-userauth and ssh-connection (no longer
	hardcoded).

Niels Möller's avatar
Niels Möller committed
418
2010-11-07  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434

	* src/testsuite/functions.sh (LSHD_CONNECTION): Deleted variable.
	(LSHD_PTY_HELPER): Deleted variable.

	* src/lshd-userauth.c (main_argp_parser): Use FILE_LSHD_CONNECTION
	directly, without consulting $LSHD_CONNECTION in the environment.
	$LSHD_LIBEXEC_DIR is consulted later.
	(main): Use FILE_LSHD_PTY_HELPER, also without cunsulting environment.
	* src/lshd.c (lshd_argp_parser): Analogous change to use
	FILE_LSHD_USERAUTH directly.

	* src/environ.h.in (ENV_LSHD_CONNECTION): Deleted,
	LSHD_LIBEXEC_DIR or service option should be sufficient.
	(ENV_LSHD_PTY_HELPER): Likewise.
	(ENV_LSHD_USERAUTH): Likewise.

Niels Möller's avatar
Niels Möller committed
435
2010-11-03  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493

	* src/testsuite/Makefile.in (TS_SH): Added lshd-example-config-test.

	* src/environ.h.in (FILE_LSHD_CONNECTION): Deleted directory part.
	(FILE_LSHD_PTY_HELPER): Likewise.

	* src/lshd.c (lshd_service_request_handler): Fixed error message
	for bad $LSHD_LIBEEXEC_DIR. Leave unrecognized "$(foo)" in the
	argument list untouched (previously, skipped the initial "$").
	(class server_config): New attributes ports_override_config_file
	and interfaces_override_config_file.
	(make_lshd_config): Initialize ports_override_config_file and
	interfaces_override_config_file.
	(OPT_NO, OPT_SETSID): Deleted constants.
	(lshd_options): Added --service and --add-service.
	(lshd_argp_children): Deleted service_argp.
	(lshd_argp_parser): Updated child init in ARGP_KEY_INIT.
	Set ports_override_config_file and interfaces_override_config_file
	if the corresponding option occurs on the command line.
	Handle --service and --add-service.
	(lshd_config_options): Added config option "service".
	(lshd_config_handler): Fixed child initialization. Check
	ports_override_config_file and interfaces_override_config_file.
	Handle "service" option.

	* src/lshd-userauth.c (handle_userauth): Use
	service_config_lookup, instead of hard-coding ssh-connection.
	Changed return type to return struct service_entry pointer.
	(main_options): Added --service and --add-service.
	(class server_config): Added service_config atttribute.
	(make_lshd_userauth_config): Call make_service_config.
	(main_argp_parser): Setup default service in ARGP_KEY_END case.
	Handle --service and --add-service.
	(lshd_userauth_config_options): New config option "service".
	(lshd_userauth_config_handler): Handle service option.
	(main): Take environment variable LSHD_LIBEXEC_DIR and compiled in
	LIBEXECDIR into account when interpreting the name of the hepler
	program and the service program. Use the service_entry returned
	from handle_userauth. Expand "$(helper_fd)" in the argument list,
	and spawn the helper program only if this expansion is used.

	* src/xalloc.h (lsh_space_free) [!DEBUG_ALLOC]: Defined to
	lsh_free rather then free, to avoid warnings when freeing const
	pointers.

	* src/server.c (service_config_lookup): Renamed and updated
	callers, from...
	(server_lookup_service): ... old name.
	(service_config_argp): New function, doing the main work for an
	argp service parser, without being one.
	(service_config_option): New function, analogous but for config
	file parsing.
	(service_argp): Deleted argp parser.
	(service_config_parser): Deleted config file parser.

	* src/server_config.c (list_append): Fixed broken indirection.
	(server_config_parse_example): Fixed CONFIG_TYPE_LIST case.

Niels Möller's avatar
Niels Möller committed
494
2010-11-01  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
495

Niels Möller's avatar
Niels Möller committed
496 497
	* src/testsuite/lshd-example-config-test: New test case.

Niels Möller's avatar
Niels Möller committed
498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516
	* src/server_config.c (list_append): Deleted return value. Instead
	aborts if allocation fails. Call config_tokenizer_next to get
	first string. Use lsh_space_free rather than plain free.
	(parser_parse_option): Call config_tokenizer_next
	after config_tokenizer_looking_at. Separate error message for
	missing '='.
	(server_config_parse_example): Handle CONFIG_TYPE_LIST (not yet
	tested).

	* src/parse_config.c (parse_setting): Call config_tokenizer_next
	after config_tokenizer_looking_at.
	(parse_groups): Likewise.

	* src/tokenize_config.c (config_tokenizer_looking_at): Don't call
	config_tokenizer_next.

	* src/testsuite/functions.sh (LSHD_USERAUTH): Partly reverted
	previous change. Define, but don't export.

Niels Möller's avatar
Niels Möller committed
517
2010-10-29  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
518

Niels Möller's avatar
Niels Möller committed
519 520 521 522 523 524 525
	* src/testsuite/functions.sh (LSHD_LIBEXEC_DIR): Define and
	export.
	(LSHD_USERAUTH): Deleted.

	* src/server_config.c (parser_parse_option): Don't check for
	proper end of line if we already had a syntax error.

Niels Möller's avatar
Niels Möller committed
526 527 528 529 530 531 532 533
	* src/lshd.c (lshd_service_request_handler): Take
	environment variable LSHD_LIBEXEC_DIR and compiled in LIBEXECDIR
	into account when interpreting the program name. Added the
	resulting name to debug output. Also deleted local variable hex.

	* src/environ.h.in (FILE_LSHD_USERAUTH): Stripped directory part.
	(ENV_LSHD_LIBEXEC_DIR): New define.

Niels Möller's avatar
Niels Möller committed
534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552
	* src/lshd.c (lshd_service_request_handler): Use
	server_lookup_service.
	(lshd_argp_parser): Updated handling of default service.
	(lshd_config_handler): Initialize service_config child.
	(lshd_config_children): Added service_config_parser.

	* src/server.c (make_service_entry): New function.
	(make_service_config): Updated initialization.
	(server_lookup_service): New function.
	(service_options): New option --service-add.
	(service_argp_parser): Support --service-add. Support multiple
	--service and --service-add options.
	(service_config_options): New config option "service".
	(service_config_handler): New function.
	(service_config_parser): New config file parser.

	* src/server.h (class service_entry): New class.
	(class service_config): Support multiple services.

Niels Möller's avatar
Niels Möller committed
553 554 555 556 557 558 559 560 561 562 563 564
	* src/tcpforward.c (make_tcpforward_listen_port): Trace output of
	requested port and the bound ip address.
	(tcpforward_connect_error): Convert error number to string.
	(tcpforward_connect): Trace output of target port.
	(tcpforward_connect): Fixed logging of errno when io_connect
	fails.

	* src/client_x11.c (x11_connect_error): Convert error number to
	string.

	* src/io.c (oop_io_connect): Use errno if getsockopt fails.

Niels Möller's avatar
Niels Möller committed
565
2010-10-28  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
566 567 568 569 570 571 572 573

	* src/testsuite/functions.sh (at_connect): Use our own mini-inetd.
	* src/testsuite/rapid7-lsh-test: Likewise.

	* src/testsuite/Makefile.in (TS_SH): Omit obsolete
	lshd-no-auth-test.
	(TARGETS): Added mini-inetd.
	(OTHER_SOURCES): Added mini-inetd.c.
Niels Möller's avatar
Niels Möller committed
574
	(mini-inetd): New rule.
Niels Möller's avatar
Niels Möller committed
575 576 577 578 579

	* src/testsuite/mini-inetd.c: New file. Reimplementation of
	mini-inetd, hopefully working better with IPv6 than the version in
	tcputils.

Niels Möller's avatar
Niels Möller committed
580
2010-10-26  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
581 582

	* src/werror.c (werror_format): Made static.
Niels Möller's avatar
Niels Möller committed
583

Niels Möller's avatar
Niels Möller committed
584 585
	* src/testsuite/server-config-test.c: Added '=' tokens in input.

Niels Möller's avatar
Niels Möller committed
586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609
	* src/testsuite/config/lshd-connection.conf: Updated to new syntax
	with '=' tokens.
	* src/testsuite/config/lshd-userauth.conf: Likewise.
	* src/testsuite/config/lshd.conf: Likewise.

	* src/server_config.c (parser_init): Deleted unnecessary cast.
	(parser_finalize): Deleted err argument and return value. Updated
	callers.
	(list_append): New function.
	(parse_value_list): New function.
	(parser_parse_option): Recognize CONFIG_TYPE_LIST. Require '='
	token for all other types.
	(server_config_print_example): Output '=' tokens. Handle
	CONFIG_TYPE_LIST.

	* src/server_config.h (enum config_type): Renamed
	CONFIG_TYPE_UNSIGNED to CONFIG_TYPE_NUMBER. Added
	CONFIG_TYPE_LIST.

	* src/tokenize_config.c (char_class): Added '=' as separator.
	(config_tokenizer_next): Recognize '='.

	* src/tokenize_config.h (enum config_token_type): Added TOK_EQUAL.

Niels Möller's avatar
Niels Möller committed
610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629
	* src/pkcs5-test.c (main): Added long options. Deleted -?, and
	fixed handling of bad options.
	* src/testsuite/prgrp-timeout.c (main): Likewise.

	* src/lshd-userauth.c (read_packet): Don't treat EOF at start of
	header as an error.
	(main): Deleted useless trace call before arpg_parse.

	* src/lshd-pty-helper.c (utmp_gettimeofday): New function, to work
	around ut_tv 32-bit backwards compatibility hack for 64-bit
	systems.

	* src/tcpforward.c (tcpforward_connect_error): Use STRERROR to
	display socket error code.
	(make_tcpforward_listen_port): Trace output of local and target
	ports.

	* src/client_x11.c (x11_connect_error): Use STRERROR to display
	socket error code.

Niels Möller's avatar
Niels Möller committed
630
2010-08-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
631 632 633 634 635 636

	* src/scm/guile-compat.scm: Use the rdelim module, for the
	read-line. Needed at least for guile-1.8.7.

	* doc/fixff.pl: Use regexp m modifier rather than the arcane $*.

Niels Möller's avatar
Niels Möller committed
637
2010-07-23  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
638 639 640 641

	* src/lshd-userauth.c (lookup_user): Set user->shell before use.
	(handle_userauth): More verbose output.

Niels Möller's avatar
Niels Möller committed
642
2010-07-20  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
643 644 645 646

	* src/crypto.c (make_des3_cbc_instance): Updated to Nettle's new
	DES interface.

Niels Möller's avatar
Niels Möller committed
647
2010-06-04  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
648

Niels Möller's avatar
Niels Möller committed
649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678
	* src/testsuite/Makefile.in (TS_SH): Added passwd-1-test and
	passwd-2-test.
	(check): Don't pass on PASSWD_PRELOAD, leave that for
	functions.sh.

	* src/testsuite/passwd-1-test: New test, using dummy passwd
	database.
	* src/testsuite/passwd-2-test: New test, password authentication.

	* src/testsuite/setup-env: Fixed setup of test password.

	* src/testsuite/functions.sh (need_getpwnam_wrapper): New function.
	(ENV_PROGRAM, GETPWNAM_PRELOAD): New variables.

	* src/testsuite/getpwnam-wrapper.c (getpwnam): Added
	empty-passwd-testuser to the dummy passwd database.

	* src/lshd.c (lshd_service_request_handler): Don't hard code
	--session-id argument, instead substitute "$(session_id)" if
	appearing on the argument list.
	(lshd_argp_parser): For the default service, ssh-userauth, add
	--session-id $(session_id) to the argument list.

	* src/lshd-userauth.c (lookup_user): If there's no login shell,
	consider the account disabled. Improved check for missing home
	directory.

	* src/Makefile.in (stamp-h): Standard rule for config.h via
	stamp-h.

Niels Möller's avatar
Niels Möller committed
679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707
	* src/lshd.c (read_host_key): Recognize dsa-sha256.

	* src/lshd-userauth.c (get_verifier): Recognize ssh-dsa-sha256.

	* src/lsh-transport.c (read_user_key): Recognize dsa-sha256.
	(lsh_transport_lookup_verifier): Recognize ssh-dsa-sha256.

	* src/lsh-decode-key.c (lsh_decode_key): Recognise ssh-dsa-sha256.
	Also slight code cleanup.

	* src/dsa.c: Updated dsa-sha1 functions for renamed constants.
	(do_dsa_verify): Require signature blob to be precisely 40 octets.
	(do_dsa_sha256_verify): New function.
	(do_dsa_sha256_public_key): New function.
	(do_dsa_sha256_public_spki_key): New function.
	(init_dsa_sha256_verifier): New function.
	(parse_ssh_dsa_sha256_public): New function.
	(do_dsa_sha256_sign): New function.
	(do_dsa_sha256_get_verifier): New function.
	(make_dsa_sha256_verifier): New function.
	(make_dsa_sha256_signer): New function.
	(dsa_sha256_algorithm): New algorithm.
	(make_ssh_dsa_sha256_verifier): New function.

	* src/crypto.h: Declarations for dsa-sha256.

	* src/algorithms.c (lookup_hostkey_algorithm): Recognize
	dsa-sha256.

Niels Möller's avatar
Niels Möller committed
708
	* src/Makefile.in (GPERF_FLAGS): Tweaked positions, to distinguish
Niels Möller's avatar
Niels Möller committed
709 710 711 712 713
	between ssh-rsa and ssh-dsa.

	* src/atoms.in: Added ssh-dsa, ssh-dsa-sha256@lysator.liu.se,
	and dsa-sha256.

Niels Möller's avatar
Niels Möller committed
714
2010-06-03  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
715 716 717 718 719 720 721

	* src/lsh-keygen.c: Added support for dsa-sha256 keys.
	(main_options): Improved descriptions.
	(dsa_sha1_generate_key): Renamed, was dsa_generate_key.
	(dsa_sha256_generate_key): New function.
	(enum config_algorithm): New enum.

Niels Möller's avatar
Niels Möller committed
722
2010-06-02  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
723 724 725 726 727

	* src/testsuite/getpwnam-wrapper.c (getpwnam): Use
	GETWPWNAM_WRAPPER_DIR to locate configuration directory.

	* src/testsuite/setup-env: Create a password for testing.
Niels Möller's avatar
Niels Möller committed
728

Niels Möller's avatar
Niels Möller committed
729
2010-06-01  Niels Möller  <nisse@lysator.liu.se>
730 731 732 733 734

	* configure.ac (LOCAL_NETTLE_DEP): When building with the bundled
	nettle library, setup a dependency when linking.
	* src/Makefile.in (LOCAL_NETTLE_DEP): Use it here.

Niels Möller's avatar
Niels Möller committed
735
2010-05-25  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
736 737 738 739

	* src/lsh-keygen.c (dsa_generate_key): Updated call to
	dsa_generate_keypair to explicitly specify a 160 bit q.

Niels Möller's avatar
Niels Möller committed
740
2010-03-30  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
741

Niels Möller's avatar
Niels Möller committed
742 743 744 745 746
	* src/dsa.c (do_dsa_verify): Updated for Nettle's dsa_sha1_verify
	rename.
	(do_dsa_sign): Updated for Nettle's dsa_sha1_sign rename, and
	check return value.

Niels Möller's avatar
Niels Möller committed
747 748 749 750 751 752
	* src/server_session.c (stdin_eof): New function. If we have a
	pty, send EOF and ignore error.
	(oop_write_stdin): Use it.
	(do_receive): Use it.
	(do_server_session_event): Use it, replacing old code to send EOF.

Niels Möller's avatar
Niels Möller committed
753
2010-03-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
754 755 756 757 758 759 760

	* src/lsh-transport.c (start_userauth): Check return value from
	the SIGN method.
	* src/server_keyexchange.c (server_dh_handler): Likewise.

	* src/rsa.c (do_rsa_sign): Check return value from rsa_sha1_sign.

Niels Möller's avatar
Niels Möller committed
761
2010-03-23  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
762 763 764 765

	* src/client_x11.c (do_client_channel_x11_receive): Fixed broken,
	too short(!), allocation for X11 connection failure message.

Niels Möller's avatar
Niels Möller committed
766
2010-03-04  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
767

Niels Möller's avatar
Niels Möller committed
768 769 770 771
	* src/testsuite/functions.sh (spawn_xvfb): Explicitly setup the
	xauthority file using xauth add, don't rely on xauth generate and
	the X11 security extension.

Niels Möller's avatar
Niels Möller committed
772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790
	* src/lsh-keygen.c (main_argp_parser): Added --bit-length option,
	to replace the old --level option. Added sypport for -a symmetric,
	which generates random keys for use as a shared secret.
	(check_file): Allow file to be NULL.
	(process_private): Hex encode symmetric keys.
	(main): Use the value of the --bit-length option. New logic to
	handle generation of symmetric keys.
	(dsa_generate_key): Take bit size as input, not a NIST security
	level.
	(main_argp_parser): By default, don't encrypt symmetric keys.

	* src/lshd.c: Updated for service_config being a class.

	* src/server.c (make_service_config): New function, replacing
	init_service_config.

	* src/server.h (service_config): Make this into a class rather
	than a struct, for safer casting in service_argp_parser.

Niels Möller's avatar
Niels Möller committed
791
2010-02-23  Niels Möller  <nisse@lysator.liu.se>
792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811

	* src/lshd.c (lshd_context): Added service_config, deleted
	commented-out attributes.
	(lshd_service_request_handler): Made service configurable.
	(make_lshd_context): Use init_transport_context and
	init_service_config.
	(lshd_config): Deleted werror_config (it's inherited via
	server_config).
	(make_lshd_config): Deleted call to make_werror_config.
	(lshd_argp_children): Added service_argp.
	(lshd_argp_parser): Updated initialization of child_inputs. Setup
	default service, ssh-userauth.
	(lshd_config_handler): Fixed references to the inherited
	werror_config.

	* src/Makefile.in (COMMON_SOURCES): Added arglist.c.

	* src/server.h (service_config): New class.

	* src/server.c (init_service_config): New function.
Niels Möller's avatar
Niels Möller committed
812
	(service_argp, service_argp_parser): New parser för --service {
813 814
	... } argument.

Niels Möller's avatar
Niels Möller committed
815
2010-02-20  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
816 817 818 819 820 821 822 823 824 825

	* src/lsh-transport.c (make_lsh_transport_config): Use
	init_transport_context.
	(start_userauth): In verbose mode, display the user name we're
	trying to authenticate.
	(try_password_auth): Likewise.
	(try_keyboard_interactive_auth): Likewise.

	* src/transport.c (init_transport_context): New function.

Niels Möller's avatar
Niels Möller committed
826
2010-02-15  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
827

Niels Möller's avatar
Niels Möller committed
828 829 830
	* src/lshd.c (make_lshd_port): Check that IPV6_V6ONLY is defined
	before trying to setsockopt it.

Niels Möller's avatar
Niels Möller committed
831 832 833
	* src/testsuite/Makefile.in (OTHER_SOURCES): Added
	getpwnam-wrapper.c.

Niels Möller's avatar
Niels Möller committed
834
2010-02-11  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
835 836 837 838

	* src/lshd-userauth.c (main_options): Renamed options to start
	with --allow or --deny.

Niels Möller's avatar
Niels Möller committed
839
2010-02-08  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
840

Niels Möller's avatar
Niels Möller committed
841 842 843
	* configure.ac: When looking for a shared libc, look for the
	symlink /libc.so.* rather than the glibc-specific name libc-*.so.

Niels Möller's avatar
Niels Möller committed
844 845 846 847
	* src/lshd-userauth.c: Renamed configuration parameters and
	corresonding variables to allow-password, allow-publickey and
	allow-root-login.

Niels Möller's avatar
Niels Möller committed
848
2010-02-05  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
849 850 851 852 853 854 855 856 857 858 859 860 861 862

	* src/testsuite/config/lshd-userauth.conf: Added enable-publickey
	option.

	* src/testsuite/lsh-4-test: Added missing call to test_done.

	* src/lshd-userauth.c (lshd_userauth_config_handler): New
	function.
	(main_options): New options --password, --publickey, --root-login,
	and negated versions.
	(handle_userauth): Implement the the options.
	(handle_publickey, handle_password): Take the configuration as
	argument, and return 0 if the method is not enabled.

Niels Möller's avatar
Niels Möller committed
863
2010-02-04  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
864

Niels Möller's avatar
Niels Möller committed
865 866 867 868 869 870
	* src/server_config.c (parser_parse_option): Require new line at
	end of option-value pair, and warn for spurious tokens before the
	end of line.

	* src/tokenize_config.c (config_tokenizer_eolp): New function.

Niels Möller's avatar
Niels Möller committed
871 872
	* src/testsuite/Makefile.in (PASSWD_PRELOAD): New variable, set
	depending on IF_LD_PRELOAD, and passed to the environment of
Niels Möller's avatar
Niels Möller committed
873
	run-tests.
Niels Möller's avatar
Niels Möller committed
874 875 876 877 878 879 880 881 882 883
	(getpwnam-wrapper): Use $(CCPIC). Deleted -rdynamic when compiling
	and -Wl,-soname when linking.

	* configure.ac: Use LSH_CCPIC.
	(IF_LD_PRELOAD): New substituted variable, set if we apepar to
	use dynamic libraries.
	(KRB_PROGRAM, PAM_PROGRAM): Deleted.

	* src/config.make.in (CCPIC): New variable.

Niels Möller's avatar
Niels Möller committed
884
2010-02-02  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
885

Niels Möller's avatar
Niels Möller committed
886 887 888 889 890 891
	* src/testsuite/Makefile.in: Added rules for building
	getpwnam-wrapper.so. Needs to be configured.

	* src/testsuite/getpwnam-wrapper.c: New file, intended to be used
	for lshd test cases.

Niels Möller's avatar
Niels Möller committed
892 893 894
	* src/client.c (kill_client_connection): Use trace rather than
	werror.

Niels Möller's avatar
Niels Möller committed
895
2010-01-12  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
896 897 898 899 900

	* src/lshd-userauth.c (handle_password): New function, currently
	untested and #if:ed out.

	* src/crypto.h (hash_algorithm): Deleted class, just use the
901
	corresponding struct nettle_hash.
Niels Möller's avatar
Niels Möller committed
902

Niels Möller's avatar
Niels Möller committed
903
2009-10-25  Niels Möller  <nisse@lysator.liu.se>
904 905 906 907

	* configure.ac: Updated URL for liboop, it's now
	http://liboop.ofb.net.

Niels Möller's avatar
Niels Möller committed
908
2009-10-21  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
909 910 911 912

	* src/lshd.c (make_lshd_port): Set the IPPROTO_IPV6ONLY socket
	option when listening on an IPv6 socket.

Niels Möller's avatar
Niels Möller committed
913
2009-10-07  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
914 915 916 917

	* src/lshd-userauth.c (lookup_user): Added support for shadow
	passwords.

Niels Möller's avatar
Niels Möller committed
918
2009-09-22  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937

	* src/testsuite/lsh-6-test (ALGORITHMS): Updated list to include
	aes128 in cbc and ctr modes.

	* src/testsuite/aes-test.c: Added tests for aes128-cbc, aes128-ctr
	and aes256-ctr.

	* src/crypto.c (crypto_aes128_cbc_algorithm): New algorithm.
	(crypto_aes128_ctr_algorithm): Likewise.

	* src/algorithms.c (all_symmetric_algorithms): Added aes128-cbc
	and aes128-ctr.
	(all_crypto_algorithms): Likewise.
	(default_crypto_algorithms): Replaced aes256-cbc by aes128-ctr, as
	the preferred choice.
	(lookup_crypto): Added "aes128-cbc" with alias "aes-cbc", added
	"aes-128-ctr" with aliases "aes", "aes128", "aes-ctr". Removed
	some aliases for "aes256-cbc" and "aes256-ctr", including the old
	"rijndael" alias.
Niels Möller's avatar
Niels Möller committed
938

Niels Möller's avatar
Niels Möller committed
939
2009-09-05  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
940 941 942 943

	* src/server_config.c (server_config_parse_example): Don't use
	options where the example is NULL.

Niels Möller's avatar
Niels Möller committed
944
2009-09-01  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
945

Niels Möller's avatar
Niels Möller committed
946 947 948 949 950 951 952 953
	* src/testsuite/functions.sh (XAUTHORITY): Put xauthority file in
	$TEST_HOME.

	* src/Makefile.in (uninstall): Delete files in $(libexecdir).

	* doc/Makefile.in (DISTFILES): Removed explicit
	srp-spec.txt (already included via $(TARGETS)).

Niels Möller's avatar
Niels Möller committed
954
	* src/Makefile.in: Added make rules for autoheader.
Niels Möller's avatar
Niels Möller committed
955

Niels Möller's avatar
Niels Möller committed
956
	* configure.ac: Test for $with_system_argp != no, rather than =
Niels Möller's avatar
Niels Möller committed
957
	yes.
Niels Möller's avatar
Niels Möller committed
958

Niels Möller's avatar
Niels Möller committed
959
2009-08-31  Niels Möller  <nisse@lysator.liu.se>
960

Niels Möller's avatar
Niels Möller committed
961 962 963 964
	* doc/Makefile.in (DISTFILES): Distribute TODO file.

	* Makefile.in (install uninstall): Recurse into sftp directory.

Niels Möller's avatar
Niels Möller committed
965
2009-08-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
966 967 968

	* .bootstrap, Makefile.in, configure.ac: Reenable building of sftp.

Niels Möller's avatar
Niels Möller committed
969
2009-05-30  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
970 971 972 973

	* doc/Makefile.in (.texinfo.info): Don't use a temporary output file
	$@T, trust makeinfo to not remove output file on errors.

Niels Möller's avatar
Niels Möller committed
974
2009-05-04  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
975 976 977

	* texinfo.tex: Upgrade to version 2009-03-22.17.

Niels Möller's avatar
Niels Möller committed
978
2009-02-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
979

Niels Möller's avatar
Niels Möller committed
980 981 982
	* src/server_pty.c (pty_open_slave): Work around Solaris problem
	with bogus definition of TIOCSCTTY.

Niels Möller's avatar
Niels Möller committed
983 984 985
	* src/lshd-pty-helper.c (die, werror, process_request): Improved
	error messages.

Niels Möller's avatar
Niels Möller committed
986
2009-02-23  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
987 988 989 990 991 992 993 994 995

	* src/testsuite/x11-4-test: Explicitly start /bin/sh at the remote
	end. Avoid recursive use of here-documents. Use $XAUTH, $XMODMAP
	and friends.

	* src/client_x11.c (make_client_x11_display): Use KILL_RESOURCE on failure.
	(do_client_channel_x11_receive): Send "access denied" message back
	when a connection is refused.

Niels Möller's avatar
Niels Möller committed
996
2009-02-16  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
997

Niels Möller's avatar
Niels Möller committed
998 999 1000 1001 1002 1003 1004 1005 1006
	* src/testsuite/x11-2-test: Use lsh, not lshg, for this test. Also
	export DISPLAY.

	* src/testsuite/x11-1-test: export DISPLAY.
	* src/testsuite/x11-5-test: Likewise.

	* src/testsuite/functions.sh: Unset DISPLAY, don't export it (the
	tests that need it should do that).

Niels Möller's avatar
Niels Möller committed
1007 1008 1009 1010 1011 1012
	* src/testsuite/x11-5-test: Use $XMODMAP.

	* src/testsuite/functions.sh (XAUTH, XMODMAP, XVFB): New
	variables.
	(need_xvfb, spawn_xvfb): Use $XVFB.

Niels Möller's avatar
Niels Möller committed
1013
2009-02-12  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1014

Niels Möller's avatar
Niels Möller committed
1015 1016 1017 1018 1019 1020
	* src/testsuite/x11-2-test: Use lshg, and also check that the
	X-forwarding is removed properly.

	* src/testsuite/functions.sh (test_result): Sleep 3 seconds before
	trying xauth generate.

Niels Möller's avatar
Niels Möller committed
1021 1022 1023
	* src/werror.c (werror_vformat): Don't output any punctuation for
	%e. Changed all callers to use it like "...: %e.\n".

Niels Möller's avatar
Niels Möller committed
1024
2009-02-11  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1025 1026 1027 1028 1029 1030 1031

	* src/pty-helper.c (pty_send_message): Clear the control area, to
	work around overly strict length validation in CMSG_NXTHDR.
	Problem present at least in glibc.
	(pty_send_message, pty_recv_message): Also clear the entire msghdr
	struct.

Niels Möller's avatar
Niels Möller committed
1032
2008-12-02  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1033 1034 1035 1036 1037 1038 1039

	* contrib/lshd.debian.init: Updated file names for host key. Use
	SIGHUP when stopping daemon.

	* src/lshd.c (lshd_config_options): Use FILE_LSHD_HOST_KEY.
	(open_interface): Fixed handling of default (NULL) interface.

Niels Möller's avatar
Niels Möller committed
1040
2008-11-27  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1041 1042 1043 1044

	* src/testsuite/x11-1-test: Set $DISPLAY and $LSH_FLAGS at
	top-level, not just locally for exec_lsh function.

Niels Möller's avatar
Niels Möller committed
1045
2008-11-26  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1046

Niels Möller's avatar
Niels Möller committed
1047 1048 1049 1050 1051
	* src/pty-helper.c (CMSG_LEN): Fallback definition now includes
	int alignment at the end of the header.
	(pty_recv_message): Check that msg_controllen is large enough
	before using CMSG_FIRSTHDR.

Niels Möller's avatar
Niels Möller committed
1052 1053 1054
	* src/server_x11.c (open_x11_socket): Try to create directory
	/tmp/.X11-unix.

Niels Möller's avatar
Niels Möller committed
1055
2008-11-22  Niels Möller  <nisse@lysator.liu.se>
1056 1057 1058 1059 1060 1061

	* src/lsh-make-seed.c (main): Reverted part of change from
	2008-11-01. Don't explicitly set the seeded flag in the yarrow
	ctx, as that results in calls to aes_encrypt before
	aes_set_encrypt_key.

Niels Möller's avatar
Niels Möller committed
1062
2008-11-12  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1063 1064 1065 1066

	* src/testsuite/functions.sh (XAUTHORITY): Use a separate export
	statement for XAUTHORITY.

Niels Möller's avatar
Niels Möller committed
1067
2008-11-10  Niels Möller  <nisse@lysator.liu.se>
1068

Niels Möller's avatar
Niels Möller committed
1069 1070 1071 1072 1073
	* src/server_x11.c (create_xauth): Added fallback when libXau is
	unavailable. Avoid using the Xauth type in the argument list. Use
	O_EXCL when creating files.
	(server_x11_setup): Updated for new create_xauth interface.
	(do_kill_x11_listen_port): Delete xauthority file.
Niels Möller's avatar
Niels Möller committed
1074

Niels Möller's avatar
Niels Möller committed
1075
	* doc/Makefile.in (DISTFILES): Added srp-spec.txt.
1076

1077 1078
	* configure.ac: Use AC_CHECK_LIB to check for libXau.

Niels Möller's avatar
Niels Möller committed
1079
2008-11-09  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1080 1081 1082

	* src/testsuite/functions.sh: Explicitly export DISPLAY.

Niels Möller's avatar
Niels Möller committed
1083
2008-11-07  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1084

1085 1086 1087
	* configure.ac: Try a different workaround for libXau on
	Solaris-5.8.

Niels Möller's avatar
Niels Möller committed
1088 1089 1090 1091 1092 1093
	* src/pty-helper.c (pty_send_message): Set msg_control to NULL if
	controllen is 0, to make FreeBSD happy.

	* src/lshd-pty-helper.c (main): Fixed error message when
	pty_send_message fails.

Niels Möller's avatar
Niels Möller committed
1094 1095 1096
	* configure.ac: Fixed check for credentials passing to work on
	FreeBSD.

Niels Möller's avatar
Niels Möller committed
1097
2008-11-06  Niels Möller  <nisse@lysator.liu.se>
1098

1099 1100 1101
	* configure.ac: Moved checks for -lnsl and -lsocket earlier.
	Updated GMP URL.

1102 1103 1104
	* configure.ac: Fixed spurious # in include section i test for
	utmp members.

Niels Möller's avatar
Niels Möller committed
1105
2008-11-05  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1106 1107 1108 1109 1110

	* configure.ac: Check for XauGetAuthByAddr in both libXau and
	libX11.
	(XAUTH_PROGRAM): Deleted check and configure option.

Niels Möller's avatar
Niels Möller committed
1111
2008-11-04  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1112

Niels Möller's avatar
Niels Möller committed
1113 1114
	* src/server_pty.h: Include <sys/termios.h>.

Niels Möller's avatar
Niels Möller committed
1115 1116 1117
	* src/pty-helper.c: Added support for FreeBSD style credentials
	passing, with SCM_CREDS and struct cmsgcred.

Niels Möller's avatar
Niels Möller committed
1118
2008-11-01  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1119 1120 1121 1122 1123 1124 1125

	* src/unix_random.c (update_seed_file): Mix in current seed file
	before overwriting it.
	(random_init): yarrow256_force_reseed replaced by
	yarrow256_slow_reseed.

	* src/lsh-make-seed.c (main): Updated for new yarrow interface in
Niels Möller's avatar
Niels Möller committed
1126
	nettle-2.0.
Niels Möller's avatar
Niels Möller committed
1127 1128 1129 1130 1131 1132
	* src/seed_file.c (seed_file_write): Likewise, generate seed file
	with yarrow256_random.

	* src/crypto.c: Updated (nettle_crypt_func *) casts, for
	nettle-2.0.

Niels Möller's avatar
Niels Möller committed
1133
2008-10-30  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1134 1135 1136 1137

	* src/lsh.c (main_argp_parser): Support user@host notation.
	(main_argp_parser): Count self->start_gateway as an action.

Niels Möller's avatar
Niels Möller committed
1138
2008-10-22  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158

	* src/transport.c (transport_send_kexinit): Use make_kexinit
	function.
	* src/transport.h (class transport_context): Type of kexinit
	attribute changed to struct kexinit_info *.

	* src/lsh-transport.c (main_argp_parser): Use make_kexinit_info.
	* src/lshd.c (lshd_config_handler): Likewise.

	* src/keyexchange.c (class kexinit_info): Renamed from
	simple_kexinit. Don't inherit make_kexinit.
	(make_kexinit_info): Renamed from make_simple_kexinit.
	(make_kexinit): New function, replacing the make method of
	the make_kexinit class.

	* src/keyexchange.h (class make_kexinit): Deleted abstract class.

	* src/dh_exchange.c (dh_hash_update): Deleted free argument.
	Updated all callers.

Niels Möller's avatar
Niels Möller committed
1159
2008-09-26  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186

	* src/Makefile.in (COMMON_SOURCES): Moved queue.c here, from
	CONNECTION_SOURCES.

	* src/lshd.c (open_ports): Replaced by three new functions, to
	support multiple listen ports.
	(open_port): Look up a port using getaddrinfo, and bind one or
	more sockets.
	(open_interface): Bind all appropriate ports for a given
	interface.
	(open_all_ports): Open all configured ports on all interfaces.
	(class lshd_interface): New class.
	(class lshd_config): Use queues to handle multiple ports and
	interfaces.
	(parse_interface): New function.
	(main_argp_parser): Handle --interface option. Accept multiple -p
	options.
	(lshd_config_handler): Likewise. Added default port logic.

	* src/testsuite/config/lshd.conf: Removed interface option, it is
	set to localhost on the command line.

	* src/testsuite/functions.sh: Set $INTERFACE.

	* src/channel.c (channel_open_new_v): Removed function, merged
	into channel_open_new_type.

Niels Möller's avatar
Niels Möller committed
1187
2008-09-03  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198

	* src/transport.c (transport_process_packet): Parse SSH_DISCONNECT
	message and display the description and reason code.

	* src/lsh-transport.c (lsh_transport_lookup_verifier): Fixed the
	code for writing out the ACL entry.
	(read_host_acls): Fixed error message for read errors.

	* src/io.c (lsh_popen_write): Close the pipe to the spawned
	process after the data is written.

Niels Möller's avatar
Niels Möller committed
1199
2008-09-02  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1200 1201 1202 1203 1204 1205 1206 1207

	* src/lsh-transport.c (lsh_transport_lookup_verifier):
	Reintroduced call to werror_quiet_p. --sloppy --quiet means that
	keys are accepted (but not stored in .lsh/host-acls), with no
	question asked.

	* src/atoms.in: Commented out or deleted unused symbols.

Niels Möller's avatar
Niels Möller committed
1208
2008-09-01  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236

	* src/testsuite/functions.sh: --capture-to option renamed to
	--host-db-update.
	* src/testsuite/lsh-9-test: Likewise.
	* src/testsuite/rapid7-lsh-test: Likewise.

	* src/lsh.c (main_options): --capture-to option renamed to
	--host-db-update. For backwards compatibility, old name kept as a
	hidden alias.
	(main_argp_parser): Pass on --host-db-update.

	* src/lsh-transport.c (lsh_transport_lookup_verifier): Ask before
	writing ACL. Add more details in the ACL comments. Use
	lsh_popen_write to pipe data through sexp-conv --lock.
	(read_host_acls): Added file name argument.
	(main_options): Renamed option --capture-to to --host-db-update.
	(main_argp_parser): Pass file name to read_host_acls. Make the
	--host-db-update option default to the file used for --host-db, by
	default ~/.lsh/host-acls.

	* src/unix_interact.c (interact_yes_or_no): Deleted argument free.
	Use werror_quiet_p and return default answer in quiet mode.
	Updated callers.

	* src/io.c (lsh_popen): Removed function, merged with
	lsh_popen_read.
	(lsh_popen_write): New function.

Niels Möller's avatar
Niels Möller committed
1237
2008-08-28  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279

	* src/unix_random.c (random_add): Don't associate any entropy with
	input of type RANDOM_SOURCE_SECRET.
	(random_init_system): Use GET_FILE_ENV, which uses FILE_SEED_FILE.

	* src/seed_file.c (seed_file_lock): Compare return value from
	fcntl to -1; according to the Solaris 10 man page, the return
	value on success not -1 but otherwise not specified at all.

	* src/lshd.c (lshd_config_handler): Use FILE_LSHD_PID and
	FILE_LSHD_HOST_KEY.

	* src/lsh-make-seed.c (main_argp_parser): Use FILE_SEED_FILE_DIR
	and FILE_SEED_FILE.

	* src/lsh-keygen.c (main_argp_parser): Use FILE_LSHD_CONFIG_DIR
	and FILE_LSHD_HOST_KEY. Create FILE_LSHD_CONFIG_DIR if it doesn't
	exist.

	* src/Makefile.in (LIBEXEC_PROGRAMS): New variable, listing
	programs that are moved to libexec, lsh-transport, lshd-userauth,
	lshd-connection and lshd-pty-helper.
	(environ.h): Substitute localstatedir.
	(install): Install $(LIBEXEC_PROGRAMS).
	(tags-here): Put TAGS file in source directory.

	* src/config.make.in (libexecdir): New variable.
	(sysconfdir): Likewise.
	(localstatedir): Likewise.

	* src/environ.h.in (LOCALSTATEDIR): New macro.
	(FILE_LSHD_HOST_KEY): New macro.
	(FILE_LSHD_PID): New macro.
	(FILE_SEED_FILE_DIR): New macro.
	(FILE_SEED_FILE): New macro.
	(FILE_LSHD_CONNECTION): Use LIBEXECDIR.
	(FILE_LSHD_PTY_HELPER): Likewise.
	(FILE_LSHD_USERAUTH): Likewise.
	(FILE_LSH_TRANSPORT): Likewise.

	* src/daemon.c (PID_DIR, PID_SUFFIX): Deleted unused macros.

Niels Möller's avatar
Niels Möller committed
1280
2008-08-26  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1281 1282 1283 1284 1285

	* src/testsuite/Makefile.in (tags): New target.

	* doc/Makefile.in (tags): New do nothing target.

Niels Möller's avatar
Niels Möller committed
1286
2008-08-20  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1287

Niels Möller's avatar
Niels Möller committed
1288
	* src/transport.c (transport_connection_kill): Cancel
Niels Möller's avatar
Niels Möller committed
1289
	oop_timer_retry.
Niels Möller's avatar
Niels Möller committed
1290 1291 1292
	(transport_stop_read): Likewise.
	(oop_timer_retry): Assert that the connection is alive.

Niels Möller's avatar
Niels Möller committed
1293 1294 1295 1296 1297 1298 1299 1300
	* src/lshd.c (class lshd_port): Inherit io_listen_port.
	(kill_port): Deleted function, it was identical with
	kill_io_fd_resource.
	(lshd_port_accept): Converted from an oop callback to an accept
	method for the io_listen_port class. Use SERVER_VERSION_LINE.
	(make_lshd_port): Changed return type to struct resource *. Take a
	sockaddr as argument, rather than an fd. Create and initialize the
	socket. Use io_listen.
Niels Möller's avatar
Niels Möller committed
1301
	(open_ports): Creation of socket moved to make_lshd_port.
Niels Möller's avatar
Niels Möller committed
1302 1303 1304 1305 1306 1307 1308 1309
	(main): Simplified logic slightly for the daemon mode.

	* src/version.h (SERVER_PROTOCOL_VERSION): Deleted constant.
	(CLIENT_PROTOCOL_VERSION): Likewise.
	(SERVER_VERSION_LINE): New constant.
	(CLIENT_VERSION_LINE): Likewise.
	Updated all users.

Niels Möller's avatar
Niels Möller committed
1310
2008-08-19  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1311 1312

	* src/lshd.c (class lshd_port): Inherit io_listen_port.
Niels Möller's avatar
Niels Möller committed
1313
	(kill_port): Deleted function.
Niels Möller's avatar
Niels Möller committed
1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340

	* src/io.c (kill_io_fd_resource): New function, replacing
	kill_io_connect_state and kill_io_listen_port.
	(init_io_connect_state): Updated for new super class
	io_fd_resource.
	(oop_io_connect): Likewise.
	(io_connect): Likewise.
	(init_io_listen_port): Likewise.
	(oop_io_accept): Likewise.
	(io_listen): Likewise.
	* src/client_tcpforward.c (do_forward_local_port): Likewise.
	* src/client_x11.c (x11_connect): Likewise.
	* src/gateway.c (do_gateway_port_accept): Likewise.
	(make_gateway_port): Likewise.
	* src/server_session.c (do_kill_server_session): Likewise.
	* src/server_tcpforward.c (make_server_forward): Likewise.
	* src/server_x11.c (do_kill_x11_listen_port): Likewise.
	(do_x11_listen_port_accept): Likewise.
	(make_x11_listen_port): Likewise.
	(server_x11_setup): Likewise.
	* src/socks.c (do_make_socks_server): Likewise.
	* src/tcpforward.c (tcpforward_connect): Likewise.

	* src/io.h (class io_fd_resource): New class.
	(class io_connect_state): Inherit io_fd_resource.
	(class io_listen_port): Likewise.

Niels Möller's avatar
Niels Möller committed
1341
2008-08-11  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1342 1343 1344

	* src/spki.c (spki_pkcs5_encrypt): Handle the case of no IV.

Niels Möller's avatar
Niels Möller committed
1345
2008-08-04  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1346

Niels Möller's avatar
Niels Möller committed
1347 1348
	* src/lsh-writekey.c: Deleted program.

Niels Möller's avatar
Niels Möller committed
1349 1350 1351
	* src/client_x11.c (x11_connect_error): Fixed call to
	channel_open_deny.

Niels Möller's avatar
Niels Möller committed
1352
2008-07-27  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1353 1354 1355

	Merged lsh-writekey into lsh-keygen. Old lsh-keygen behavior is
	enabled with --write-raw, old lsh-writekey behaviour is enabled by
Niels Möller's avatar
Niels Möller committed
1356 1357
	--read-raw.

Niels Möller's avatar
Niels Möller committed
1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378
	* src/testsuite/write-key-1-test: Use lsh-keygen --write-raw.
	* src/testsuite/write-key-2-test: Likewise.

	* src/testsuite/rapid7-lsh-test: Silence output.

	* src/testsuite/lsh-decrypt-key-test: Use the --read-raw and
	--write-raw flags to lsh-keygen.

	* src/testsuite/keygen-1-test: Don't use lsh-writekey.
	* src/testsuite/keygen-2-test: Likewise.
	* src/testsuite/lsh-encrypted-key-test: Likewise.
	* src/testsuite/setup-env: Likewise.

	* src/Makefile.in (BIN_PROGRAMS): Removed lsh-writekey.
	(INTERACT_RANDOM_SOURCES): New variable.
	(CRYPTO_SOURCES): Removed lock_file.c and randomness.c. Added
	seed_file.c.
	(CONNECTION_SOURCES): Removed command.c and exception.c.
	(lsh_SOURCES): Removed xauth.c.
	(lsh_writekey_SOURCES): Deleted.
	(lsh_writekey_OBJS): Deleted.
Niels Möller's avatar
Niels Möller committed
1379
	(lsh-writekey): Deleted target.
Niels Möller's avatar
Niels Möller committed
1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400
	(lsh_transport_OBJS): Added $(INTERACT_RANDOM_OBJS).
	(lsh_keygen_OBJS): Likewise.

	* src/lsh-keygen.c: New constants OPT_READ_RAW, OPT_WRITE_RAW,
	OPT_LABEL and OPT_PASSPHRASE.
	(class lsh_keygen_options): New flags read_raw and write_raw.
	Merged configuration attributes from lsh-writekey.
	(make_lsh_keygen_options): Initialize new attributes.
	(main_options): Merged lsh-writekey options.
	(main_argp_parser): Merged option handling from lsh-writekey.
	(main_argp): New shorter description.
	(dsa_generate_key): Adapted to new randomness interface. Deleted
	randomness argument.
	(rsa_generate_key): Likewise.
	(check_file): Moved from lsh-writekey.c.
	(open_file): Likewise.
	(process_private): Likewise.
	(process_public): Likewise.
	(main): Adapted to new randomness interface. Aded code to split
	key into private and public parts, stored in different files.

Niels Möller's avatar
Niels Möller committed
1401
2008-07-07  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1402 1403

	Reorganized client actions.
Niels Möller's avatar
Niels Möller committed
1404

Niels Möller's avatar
Niels Möller committed
1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446
	* src/lsh.h: Deleted forward declarations of obsolete classes.

	* src/channel.c (make_channel_open_exception): Deleted function.

	* src/command.c: Deleted file.
	* src/command.h: Deleted file.
	* src/exception.c: Deleted file.
	* src/exception.h: Deleted file.

	* src/lsh.c (class lsh_options): Deleted handler attribute. Added
	detach flag.
	(make_options): Deleted handler argrment.
	(add_action): Changed argument type to client_connection_action.
	(make_client_session): Deleted handler argument in call to
	make_client_session_channel.
	(client_shell_session): Changed return type to
	client_connection_action. Use make_open_session_action.
	(client_subsystem_session): Likewise.
	(client_command_session): Likewise.
	(main_argp_parser): Changeed handling of -B, just set detach flag.
	(class lsh_default_handler): Deleted class.
	(do_lsh_default_handler): Deleted function.
	(make_lsh_default_handler): Deleted function.
	(main): Actions are now handled using the client_connection_action
	class, not as commands. This was the last use of the command and
	exception abstractions.
	(main): Handle detach (-B flag) here.

	* src/tcpforward.c (tcpforward_remove): Use CAST_SUBTYPE.

	* src/socks.c (SOCKS_HANDSHAKE): Deleted macro.
	(class make_socks_server_action): Replaces class
	make_socks_server_command.
	(make_socks_server): Changed return type to
	client_connection_action.

	* src/channel_forward.c (forward_start_io_command): Deleted unused
	command.

	* src/client_tcpforward.c (class forward_local_port_action):
	Replaces class forward_local_port_command.
	(class request_tcpip_forward_action): Replaces class
Niels Möller's avatar
Niels Möller committed
1447
	request_tcpip_forward_command.
Niels Möller's avatar
Niels Möller committed
1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464
	(forward_local_port): Changed return type to
	client_connection_action.
	(forward_remote_port): Likewise.

	* src/client_session.c (do_client_session_event): No special error
	handling for CHANNEL_EVENT_DENY.
	(make_client_session_channel): Deleted exception handler argument.

	* src/client.c (class session_open_action): Replaces class
	session_open_command.
	(class background_process_command): Deleted class.

	* src/client.h (class client_connection_action): New class.
	(class client_session): Deleted exception handler attribute.

	* src/server_tcpforward.c (OPEN_FORWARDED_TCPIP): Deleted unused
	macro.
Niels Möller's avatar
Niels Möller committed
1465

Niels Möller's avatar
Niels Möller committed
1466
2008-07-06  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499

	Simplified interface to the randomness generator.

	* src/testsuite/Makefile.in (TEST_OBJS): Removed lock_file.o,
	randomness.o and unix_random.o.

	* src/testsuite/testutils.c (bad_random): New global variable.
	(random_generate): New fake randomness generator, replacing the
	real generator for the testcases.
	(lsh_random): Likewise.
	(test_sign): Initialize the fake randomness generator.

	* src/testsuite/functions.sh: Set $LSH_MAKE_SEED to /bin/false.

	* src/environ.h.in (FILE_LSH_MAKE_SEED): New macro.
	(ENV_LSH_MAKE_SEED): Likewise.

	* src/unix_random_user.c: New file.
	(random_init_user): New function. Replaces make_user_random. Tries
	to create the seed file automatically, if missing.

	* src/unix_random.c: Use globals for the generator state.
	(unix_random): Deleted class.
	(read_initial_seed_file): Simplified. Permission check moved to
	random_init. Seeking is done by read_seed_file.
	(update_seed_file): Deleted argument. Use seed_file.h interface.
	(trivia_source): Renamed from do_trivia_source. Use globals.
	(device_source): Renamed from do_device_source. Use globals.
	(random_generate): Replaces method do_unix_random.
	(random_add): Replaces method do_unix_random_add.
	(random_init): Use seed_file.h interface. Initialize all globals,
	including the sources'.
	(make_user_random): Deleted, replaced by random_init_user in
Niels Möller's avatar
Niels Möller committed
1500
	unix_random_user.c.
Niels Möller's avatar
Niels Möller committed
1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561
	(random_init_system): Replaces make_system_random.
	(lsh_random): Moved definition here, from randomness.c.

	* src/lsh-make-seed.c (enum source_type): Deleted type
	SOURCE_DEV_MEM.
	(main): Use seed_file.h interface for locking and writing to the
	seed file.

	* src/lsh-writekey.c: Adapted to new randomness interface.

	* src/lsh-transport.c (make_lsh_transport_config): No argument to
	all_signature_algorithms. Deleted call to make_user_random.
	(lsh_transport_service_packet_handler): No randomness argument to
	lsh_string_write_random.
	(try_password_auth): Use random_add to mix the secret password
	into the randomness generator.
	(main): Use random_init_user.

	* src/lsh-export-key.c: No argument to all_signature_algorithms.

	* src/client_x11.c (channel_open_x11): Deleted old #if:ed out
	code.
	(xauth_lookup): Function moved here, from xauth.c.
	* xauth.c, xauth.h: Deleted files.

	* src/gateway_tcpforward.c (do_kill_gateway_forward): Fixed typo
	in prototype.

	* src/client_keyexchange.c (client_dh_init): Updated for new
	dh_generate_secret, with no randomness argument.
	* src/server_keyexchange.c (server_dh_init): Likewise.

	* src/lock_file.c, src/lock_file.h: Deleted, replaced by
	seed_file.c and seed_file.h
	* src/seed_file.h: New file.
	* src/seed_file.c: New file.

	* src/transport.c (oop_write_ssh): Updated call to
	transport_write_flush.
	(transport_send_packet): Updated calls to transport_write_packet
	and transport_write_flush.
	(transport_send_kexinit): Updated to new make_kexinit interface.

	* src/transport_write.c (make_ignore_packet): Deleted randomness
	argument.
	(transport_write_packet): Likewise.
	(transport_write_flush): Likewise.

	* src/transport_read.c (decode_packet): Use random_add, to mix the
	received random padding into the pool.

	* src/transport.h (class transport_context): Deleted randomness
	attribute.

	* src/spki.c (spki_pkcs5_encrypt): Deleted randomness argument.

	* src/lshd.c (make_lshd_context): No randomness attribute.
	(lshd_config_handler): Adapted to new randomness interface.
	(main): Likewise.

	* src/dsa.c (class dsa_algorithm): Deleted class, randomness
Niels Möller's avatar
Niels Möller committed
1562
	attribute no longer needed.
Niels Möller's avatar
Niels Möller committed
1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591
	(class dsa_signer): Deleted randomness attribute.
	(do_dsa_sign): Adapted to new randomness interface.
	(make_dsa_signer): No randomness attribute.
	(make_dsa_algorithm): Deleted function. Replaced by...
	(dsa_algorithm): New static object.

	* src/encrypt.c (encrypt_packet): Deleted randomness argument.

	* src/dh_exchange.c (dh_generate_secret): Deleted randomness
	argument.

	* src/algorithms.c (all_signature_algorithms): Deleted randomness
	argument.

	* src/randomness.c: Deleted file.

	* src/lsh_string.c (lsh_string_random): Adapted to new randomness
	interface, and deleted randomness argument.
	(lsh_string_write_random): Likewise.

	* src/keyexchange.h (class make_kexinit): Deleted randomness
	argument from the make method.
	(MAKE_KEXINIT): Deleted macro.

	* src/keyexchange.c (do_make_simple_kexinit): Adapted to new
	randomness interface, and deleted randomness argument.

	* src/randomness.h: Deleted randomness class. New interface using
	plain functions random_generate and random_add.
Niels Möller's avatar
Niels Möller committed
1592

Niels Möller's avatar
Niels Möller committed
1593
2008-06-17  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1594

Niels Möller's avatar
Niels Möller committed
1595 1596
	* src/.dist_classes (dist_classes): Deleted channel.c.x,
	combinators.c.x, gateway_channel.c.x, io_commands.c.x. Added
Niels Möller's avatar
Niels Möller committed
1597 1598 1599 1600 1601
	gateway_tcpforward.c.x.

	* src/.dist_headers (dist_headers): Deleted io_commands.h and
	suspend.h.

Niels Möller's avatar
Niels Möller committed
1602
2008-06-16  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614

	* src/testsuite/Makefile.in (TS_SH): Added lshg-tcpip-remote-test.

	* src/testsuite/lshg-tcpip-remote-test: New test case.

	* src/Makefile.in (lsh_SOURCES): Added gateway_tcpforward.c.

	* src/gateway.h (gateway_tcpip_forward_handler): New declaration.

	* src/gateway.c (make_gateway_connection): Add handler for
	GLOBAL_REQUEST tcpip-forward.

Niels Möller's avatar
Niels Möller committed
1615
2008-06-15  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1616 1617 1618

	* src/gateway_tcpforward.c: New file.

Niels Möller's avatar
Niels Möller committed
1619
2008-06-14  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1620 1621 1622 1623 1624 1625 1626 1627 1628

	* src/Makefile.in (lsh_SOURCES): Added gateway_x11.c.

	* src/testsuite/Makefile.in (TS_SH): Added x11-5-test.

	* src/testsuite/x11-5-test: New test for x11 forwarding over a
	gateway.

	* src/lsh.c (main): When we're starting a gateway, enable channel
Niels Möller's avatar
Niels Möller committed
1629
	open handler for x11 and forwrded-tcp channels.
Niels Möller's avatar
Niels Möller committed
1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649

	* src/gateway_x11.c (gateway_x11_request_handler): Put the handler
	on the connection's resource list. Record the number of pending
	replies *including* the one for the x11-req.

	* src/gateway_channel.c (class gateway_channel): Moved to
	gateway.h. Adapted to changed type of chain.
	(do_kill_gateway_channel): Kill x11
	handler, if present.
	(do_gateway_channel_event): Check for the reply to x11-req, and
	install x11 handler.
	(gateway_forward_channel_open): Install handler for x11-req on the
	originating channel.

	* src/gateway.h (class gateway_channel): Moved definition here,
	from gateway_chanel.h. Changed type of chain attribute to
	gateway_channel.

	* src/gateway_x11.c: New file.

Niels Möller's avatar
Niels Möller committed
1650
2008-06-09  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697