CVS log for src/usr.bin/ssh/channels.c

Request diff between arbitrary revisions

Default branch: MAIN

Revision 1.438 / (download) - annotate - [select for diffs], Fri May 17 00:30:23 2024 UTC (75 minutes, 50 seconds ago) by djm
Branch: MAIN
CVS Tags: HEAD
Changes since 1.437: +1 -21 lines
Diff to previous 1.437 (colored)

Start the process of splitting sshd into separate binaries. This step
splits sshd into a listener and a session binary. More splits are
planned.

After this changes, the listener binary will validate the configuration,
load the hostkeys, listen on port 22 and manage MaxStartups only. All
session handling will be performed by a new sshd-session binary that the
listener fork+execs.

This reduces the listener process to the minimum necessary and sets us
up for future work on the sshd-session binary.

feedback/ok markus@ deraadt@

NB. if you're updating via source, please restart sshd after installing,
otherwise you run the risk of locking yourself out.

Revision 1.437 / (download) - annotate - [select for diffs], Wed Mar 6 02:59:59 2024 UTC (2 months, 1 week ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5
Changes since 1.436: +3 -4 lines
Diff to previous 1.436 (colored)

fix memory leak in mux proxy mode when requesting forwarding.

found by RASU JSC, reported by Maks Mishin in GHPR#467

Revision 1.436 / (download) - annotate - [select for diffs], Tue Jan 9 22:19:00 2024 UTC (4 months ago) by djm
Branch: MAIN
Changes since 1.435: +57 -17 lines
Diff to previous 1.435 (colored)

add a "global" ChannelTimeout type to ssh(1) and sshd(8) that watches
all open channels and will close all open channels if there is no
traffic on any of them for the specified interval. This is in addition
to the existing per-channel timeouts added a few releases ago.

This supports use-cases like having a session + x11 forwarding channel
open where one may be idle for an extended period but the other is
actively used. The global timeout would allow closing both channels when
both have been idle for too long.

ok dtucker@

Revision 1.435 / (download) - annotate - [select for diffs], Mon Dec 18 14:47:20 2023 UTC (4 months, 4 weeks ago) by djm
Branch: MAIN
Changes since 1.434: +14 -5 lines
Diff to previous 1.434 (colored)

stricter handling of channel window limits

This makes ssh/sshd more strict in handling non-compliant peers that
send more data than the advertised channel window allows. Previously
the additional data would be silently discarded. This change will
cause ssh/sshd to terminate the connection if the channel window is
exceeded by more than a small grace allowance.

ok markus@

Revision 1.434 / (download) - annotate - [select for diffs], Wed Nov 15 22:51:49 2023 UTC (6 months ago) by djm
Branch: MAIN
Changes since 1.433: +18 -1 lines
Diff to previous 1.433 (colored)

when deciding whether to enable keystroke timing obfuscation,
only consider enabling it when a channel with a tty is open.

Avoids turning on the obfucation when X11 forwarding only is in use,
which slows it right down. Reported by Roger Marsh

Revision 1.433 / (download) - annotate - [select for diffs], Mon Sep 4 00:01:46 2023 UTC (8 months, 1 week ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4
Changes since 1.432: +22 -13 lines
Diff to previous 1.432 (colored)

make channel_output_poll() return a flag indicating whether channel
data was enqueued. Will be used to improve keystroke timing
obfuscation. Problem spotted by / tested by naddy@

Revision 1.432 / (download) - annotate - [select for diffs], Tue Jul 4 03:59:21 2023 UTC (10 months, 1 week ago) by dlg
Branch: MAIN
Changes since 1.431: +4 -3 lines
Diff to previous 1.431 (colored)

add support for unix domain sockets to ssh -W

ok djm@ dtucker@

Revision 1.431 / (download) - annotate - [select for diffs], Mon Jun 5 13:24:36 2023 UTC (11 months, 1 week ago) by millert
Branch: MAIN
Changes since 1.430: +5 -5 lines
Diff to previous 1.430 (colored)

Store timeouts as int, not u_int as they are limited to INT_MAX.
Fixes sign compare warnings systems with 32-bit time_t due to type
promotion.  OK djm@

Revision 1.430 / (download) - annotate - [select for diffs], Fri Mar 10 03:01:51 2023 UTC (14 months, 1 week ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.429: +4 -4 lines
Diff to previous 1.429 (colored)

Expliticly ignore return code from fcntl(.. FD_CLOEXEC) since there's
not much we can do anyway.  From Coverity CID 291857, ok djm@

Revision 1.429 / (download) - annotate - [select for diffs], Tue Mar 7 21:47:42 2023 UTC (14 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.428: +19 -11 lines
Diff to previous 1.428 (colored)

refactor to be more readable top to bottom. Prompted by Coverity CID
405048 which was a false-positive fd leak; ok dtucker@

Revision 1.428 / (download) - annotate - [select for diffs], Sat Mar 4 03:22:59 2023 UTC (14 months, 2 weeks ago) by dtucker
Branch: MAIN
Changes since 1.427: +4 -4 lines
Diff to previous 1.427 (colored)

Use time_t instead of u_int for remaining x11 timeout checks for 64bit
time_t safety.  From Coverity CIDs 405197 and 405028, ok djm@

Revision 1.427 / (download) - annotate - [select for diffs], Wed Jan 18 02:00:10 2023 UTC (15 months, 4 weeks ago) by djm
Branch: MAIN
Changes since 1.426: +14 -5 lines
Diff to previous 1.426 (colored)

when restoring non-blocking mode to stdio fds, restore exactly
the flags that ssh started with and don't just clobber them with
zero, as this could also remove the append flag from the set;

bz3523; ok dtucker@

Revision 1.426 / (download) - annotate - [select for diffs], Fri Jan 6 02:47:18 2023 UTC (16 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.425: +106 -12 lines
Diff to previous 1.425 (colored)

Implement channel inactivity timeouts

This adds a sshd_config ChannelTimeouts directive that allows channels that
have not seen traffic in a configurable interval to be automatically closed.
Different timeouts may be applied to session, X11, agent and TCP forwarding
channels.

Note: this only affects channels over an opened SSH connection and not
the connection itself. Most clients close the connection when their channels
go away, with a notable exception being ssh(1) in multiplexing mode.

ok markus dtucker

Revision 1.425 / (download) - annotate - [select for diffs], Fri Jan 6 02:42:34 2023 UTC (16 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.424: +23 -3 lines
Diff to previous 1.424 (colored)

Add channel_set_xtype()

This sets an "extended" channel type after channel creation (e.g.
"session:subsystem:sftp") that will be used for setting channel inactivity
timeouts.

ok markus dtucker

Revision 1.424 / (download) - annotate - [select for diffs], Fri Jan 6 02:41:49 2023 UTC (16 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.423: +9 -9 lines
Diff to previous 1.423 (colored)

tweak channel ctype names

These are now used by sshd_config:ChannelTimeouts to specify timeouts by
channel type, so force them all to use a similar format without whitespace.

ok dtucker markus

Revision 1.423 / (download) - annotate - [select for diffs], Fri Jan 6 02:39:59 2023 UTC (16 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.422: +29 -14 lines
Diff to previous 1.422 (colored)

Add channel_force_close()

This will forcibly close an open channel by simulating read/write errors,
draining the IO buffers and calling the detach function.

Previously the detach function was only ever called during channel garbage
collection, but there was no way to signal the user of a channel (e.g.
session.c) that its channel was being closed deliberately (vs. by the
usual state-machine logic). So this adds an extra "force" argument to the
channel cleanup callback to indicate this condition.

ok markus dtucker

Revision 1.422 / (download) - annotate - [select for diffs], Fri Jan 6 02:38:23 2023 UTC (16 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.421: +9 -18 lines
Diff to previous 1.421 (colored)

replace manual poll/ppoll timeout math with ptimeout API

feedback markus / ok markus dtucker

Revision 1.421 / (download) - annotate - [select for diffs], Fri Nov 18 19:47:40 2022 UTC (17 months, 4 weeks ago) by mbuhl
Branch: MAIN
Changes since 1.420: +6 -7 lines
Diff to previous 1.420 (colored)

In channel_request_remote_forwarding the parameters for permission_set_add
are leaked as they are also duplicated in the call.
Found by CodeChecker.
ok djm

Revision 1.420 / (download) - annotate - [select for diffs], Mon Sep 19 08:49:50 2022 UTC (19 months, 3 weeks ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2
Changes since 1.419: +8 -7 lines
Diff to previous 1.419 (colored)

better debugging for connect_next()

Revision 1.419 / (download) - annotate - [select for diffs], Thu May 5 00:56:58 2022 UTC (2 years ago) by djm
Branch: MAIN
Changes since 1.418: +4 -4 lines
Diff to previous 1.418 (colored)

channel_new no longer frees remote_name.  So update the comment
accordingly.  As remote_name is not modified, it can be const
as well. From Martin Vahlensieck

Revision 1.418 / (download) - annotate - [select for diffs], Wed May 4 07:31:22 2022 UTC (2 years ago) by markus
Branch: MAIN
Changes since 1.417: +9 -4 lines
Diff to previous 1.417 (colored)

make sure stdout is non-blocking; ok djm@

Revision 1.417 / (download) - annotate - [select for diffs], Wed Apr 20 04:19:11 2022 UTC (2 years ago) by djm
Branch: MAIN
Changes since 1.416: +5 -6 lines
Diff to previous 1.416 (colored)

Try to continue running local I/O for channels in state OPEN during
SSH transport rekeying. The most visible benefit is that it should make
~-escapes work in the client (e.g. to exit) if the connection happened
to have stalled during a rekey event. Based work by and ok dtucker@

Revision 1.416 / (download) - annotate - [select for diffs], Mon Apr 11 22:52:08 2022 UTC (2 years, 1 month ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.415: +7 -2 lines
Diff to previous 1.415 (colored)

clear io_want/io_ready flags at start of poll() cycle;
avoids plausible spin during rekeying if channel io_want flags are
reused across cycles. ok markus@ deraadt@

Revision 1.415 / (download) - annotate - [select for diffs], Wed Mar 30 21:10:25 2022 UTC (2 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.414: +116 -102 lines
Diff to previous 1.414 (colored)

fix poll() spin when a channel's output fd closes without data in the
channel buffer. Introduce more exact packing of channel fds into the
pollfd array. fixes bz3405 and bz3411; ok deraadt@ markus@

Revision 1.414 / (download) - annotate - [select for diffs], Tue Mar 15 05:27:37 2022 UTC (2 years, 2 months ago) by djm
Branch: MAIN
Changes since 1.413: +5 -5 lines
Diff to previous 1.413 (colored)

improve DEBUG_CHANNEL_POLL debugging message

Revision 1.413 / (download) - annotate - [select for diffs], Thu Feb 17 10:58:27 2022 UTC (2 years, 2 months ago) by djm
Branch: MAIN
Changes since 1.412: +3 -1 lines
Diff to previous 1.412 (colored)

check for EINTR/EAGAIN failures in the rfd fast-path;
caught by dtucker's minix3 vm :) ok dtucker@

Revision 1.412 / (download) - annotate - [select for diffs], Sat Jan 22 00:45:31 2022 UTC (2 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.411: +31 -5 lines
Diff to previous 1.411 (colored)

Use sshbuf_read() to read directly into the channel input buffer
rather than into a stack buffer that needs to be copied again;
Improves performance by about 1% on cipher-speed.sh
feedback dtucker@ ok markus@

Revision 1.411 / (download) - annotate - [select for diffs], Thu Jan 6 21:48:38 2022 UTC (2 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.410: +272 -129 lines
Diff to previous 1.410 (colored)

convert ssh, sshd mainloops from select() to poll();
feedback & ok deraadt@ and markus@
has been in snaps for a few months

Revision 1.410 / (download) - annotate - [select for diffs], Thu Jan 6 21:46:23 2022 UTC (2 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.409: +128 -82 lines
Diff to previous 1.409 (colored)

prepare for conversion of ssh, sshd mainloop from select() to poll()
by moving FD_SET construction out of channel handlers into separate
functions. ok markus

Revision 1.409 / (download) - annotate - [select for diffs], Sat Jan 1 01:55:30 2022 UTC (2 years, 4 months ago) by jsg
Branch: MAIN
Changes since 1.408: +2 -2 lines
Diff to previous 1.408 (colored)

spelling
ok dtucker@

Revision 1.408 / (download) - annotate - [select for diffs], Tue Sep 14 11:04:21 2021 UTC (2 years, 8 months ago) by mbuhl
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.407: +5 -3 lines
Diff to previous 1.407 (colored)

put back the mux_ctx memleak fix for SSH_CHANNEL_MUX_CLIENT
OK mfriedl@

Revision 1.407 / (download) - annotate - [select for diffs], Wed May 19 01:24:05 2021 UTC (2 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.406: +47 -20 lines
Diff to previous 1.406 (colored)

restore blocking status on stdio fds before close

ssh(1) needs to set file descriptors to non-blocking mode to operate
but it was not restoring the original state on exit. This could cause
problems with fds shared with other programs via the shell, e.g.

> $ cat > test.sh << _EOF
> #!/bin/sh
> {
>         ssh -Fnone -oLogLevel=verbose ::1 hostname
>         cat /usr/share/dict/words
> } | sleep 10
> _EOF
> $ ./test.sh
> Authenticated to ::1 ([::1]:22).
> Transferred: sent 2352, received 2928 bytes, in 0.1 seconds
> Bytes per second: sent 44338.9, received 55197.4
> cat: stdout: Resource temporarily unavailable

This restores the blocking status for fds 0,1,2 (stdio) before ssh(1)
abandons/closes them.

This was reported as bz3280 and GHPR246; ok dtucker@

Revision 1.406 / (download) - annotate - [select for diffs], Sat Apr 3 06:18:40 2021 UTC (3 years, 1 month ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9
Changes since 1.405: +4 -4 lines
Diff to previous 1.405 (colored)

highly polished whitespace, mostly fixing spaces-for-tab and bad
indentation on continuation lines. Prompted by GHPR#185

Revision 1.405 / (download) - annotate - [select for diffs], Mon Feb 15 20:43:15 2021 UTC (3 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.404: +20 -1 lines
Diff to previous 1.404 (colored)

ssh: add PermitRemoteOpen for remote dynamic forwarding with SOCKS
ok djm@, dtucker@

Revision 1.404 / (download) - annotate - [select for diffs], Wed Jan 27 09:26:53 2021 UTC (3 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.403: +5 -5 lines
Diff to previous 1.403 (colored)

remove global variable used to stash compat flags and use the
purpose-built ssh->compat variable instead; feedback/ok markus@

Revision 1.403 / (download) - annotate - [select for diffs], Sun Oct 18 11:32:01 2020 UTC (3 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.402: +189 -274 lines
Diff to previous 1.402 (colored)

use the new variant log macros instead of prepending __func__ and
appending ssh_err(r) manually; ok markus@

Revision 1.402 / (download) - annotate - [select for diffs], Sun Sep 20 05:47:25 2020 UTC (3 years, 7 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.401: +4 -1 lines
Diff to previous 1.401 (colored)

cap channel input buffer size at 16MB; avoids high memory use when
peer advertises a large window but is slow to consume the data we
send (e.g. because of a slow network)

reported by Pierre-Yves David

fix with & ok markus@

Revision 1.401 / (download) - annotate - [select for diffs], Fri Jul 3 07:25:18 2020 UTC (3 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.400: +5 -1 lines
Diff to previous 1.400 (colored)

put back the mux_ctx memleak fix, but only for channels of type
SSH_CHANNEL_MUX_LISTENER; Specifically SSH_CHANNEL_MUX_PROXY channels
should not have this structure freed.

Revision 1.400 / (download) - annotate - [select for diffs], Fri Jul 3 07:17:35 2020 UTC (3 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.399: +1 -3 lines
Diff to previous 1.399 (colored)

revert r1.399 - the lifetime of c->mux_ctx is more complex; simply freeing
it here causes other problems

Revision 1.399 / (download) - annotate - [select for diffs], Fri Jul 3 05:08:41 2020 UTC (3 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.398: +3 -1 lines
Diff to previous 1.398 (colored)

fix memory leak of mux_ctx; patch from Sergiy Lozovsky via bz3189
ok dtucker

Revision 1.398 / (download) - annotate - [select for diffs], Sat Apr 25 06:59:36 2020 UTC (4 years ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.397: +2 -2 lines
Diff to previous 1.397 (colored)

We've standardized on memset over bzero, replace a couple that had slipped
in.  ok deraadt markus djm.

Revision 1.397 / (download) - annotate - [select for diffs], Fri Mar 6 18:19:21 2020 UTC (4 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.396: +3 -3 lines
Diff to previous 1.396 (colored)

fix uninitialized pointers for forward_cancel; ok djm

Revision 1.396 / (download) - annotate - [select for diffs], Wed Feb 26 13:40:09 2020 UTC (4 years, 2 months ago) by jsg
Branch: MAIN
Changes since 1.395: +4 -7 lines
Diff to previous 1.395 (colored)

change explicit_bzero();free() to freezero()

While freezero() returns early if the pointer is NULL the tests for
NULL in callers are left to avoid warnings about passing an
uninitialised size argument across a function boundry.

ok deraadt@ djm@

Revision 1.395 / (download) - annotate - [select for diffs], Sat Jan 25 06:40:20 2020 UTC (4 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.394: +7 -2 lines
Diff to previous 1.394 (colored)

the GatewayPorts vs -R listen address selection logic is still
confusing people, so add another comment explaining the special
handling of "localhost"; bz#3258

Revision 1.394 / (download) - annotate - [select for diffs], Sun Jul 7 01:05:00 2019 UTC (4 years, 10 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.393: +2 -3 lines
Diff to previous 1.393 (colored)

Remove some set but never used variables. ok daraadt@

Revision 1.393 / (download) - annotate - [select for diffs], Fri Jun 28 13:35:04 2019 UTC (4 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.392: +23 -23 lines
Diff to previous 1.392 (colored)

When system calls indicate an error they return -1, not some arbitrary
value < 0.  errno is only updated in this case.  Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.

Revision 1.392 / (download) - annotate - [select for diffs], Fri Jun 7 14:18:48 2019 UTC (4 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.391: +2 -2 lines
Diff to previous 1.391 (colored)

Typo and spelling fixes in comments and error messages.  Patch from
knweiss at gmail.com via -portable.

Revision 1.391 / (download) - annotate - [select for diffs], Fri May 10 18:55:17 2019 UTC (5 years ago) by florian
Branch: MAIN
Changes since 1.390: +21 -3 lines
Diff to previous 1.390 (colored)

For PermitOpen violations add the remote host and port to
be able to find out from where the request was comming.

Add the same logging for PermitListen violations which where not
logged at all.

Pointed out by Robert Kisteleki (robert AT ripe.net)

input markus
OK deraadt

Revision 1.390 / (download) - annotate - [select for diffs], Fri May 3 04:11:00 2019 UTC (5 years ago) by dtucker
Branch: MAIN
Changes since 1.389: +24 -4 lines
Diff to previous 1.389 (colored)

Free channel objects on exit path.  Patch from markus at blueflash.cc,
ok deraadt

Revision 1.389 / (download) - annotate - [select for diffs], Sat Jan 19 21:37:13 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.388: +38 -30 lines
Diff to previous 1.388 (colored)

convert channels.c to new packet API

with & ok markus@

Revision 1.388 / (download) - annotate - [select for diffs], Sat Jan 19 21:31:32 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.387: +4 -1 lines
Diff to previous 1.387 (colored)

begin landing remaining refactoring of packet parsing API, started
almost exactly six years ago.

This change stops including the old packet_* API by default and makes
each file that requires the old API include it explicitly. We will
commit file-by-file refactoring to remove the old API in consistent
steps.

with & ok markus@

Revision 1.387 / (download) - annotate - [select for diffs], Fri Dec 7 02:31:20 2018 UTC (5 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.386: +2 -6 lines
Diff to previous 1.386 (colored)

no need to allocate channels_pre/channels_post in channel_init_channels()
as we do it anyway in channel_handler_init() that we call at the end of
the function. Fix from Markus Schmidt via bz#2938

Revision 1.386 / (download) - annotate - [select for diffs], Thu Oct 4 01:04:52 2018 UTC (5 years, 7 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.385: +24 -13 lines
Diff to previous 1.385 (colored)

factor out channel status formatting from channel_open_message() so
we can use it in other debug messages

Revision 1.385 / (download) - annotate - [select for diffs], Thu Oct 4 00:10:11 2018 UTC (5 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.384: +26 -3 lines
Diff to previous 1.384 (colored)

include a little more information about the status and disposition of
channel's extended (stderr) fd; makes debugging some things a bit easier.
No behaviour change.

Revision 1.384 / (download) - annotate - [select for diffs], Fri Jul 27 12:03:17 2018 UTC (5 years, 9 months ago) by markus
Branch: MAIN
Changes since 1.383: +6 -4 lines
Diff to previous 1.383 (colored)

avoid expensive channel_open_message() calls; ok djm@

Revision 1.383 / (download) - annotate - [select for diffs], Wed Jul 11 18:53:29 2018 UTC (5 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.382: +2 -2 lines
Diff to previous 1.382 (colored)

remove legacy key emulation layer; ok djm@

Revision 1.382 / (download) - annotate - [select for diffs], Mon Jun 25 22:28:33 2018 UTC (5 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.381: +2 -2 lines
Diff to previous 1.381 (colored)

fix NULL dereference in open_listen_match_tcpip()

Revision 1.381 / (download) - annotate - [select for diffs], Wed Jun 6 18:22:41 2018 UTC (5 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.380: +302 -173 lines
Diff to previous 1.380 (colored)

Add a PermitListen directive to control which server-side addresses
may be listened on when the client requests remote forwarding (ssh -R).

This is the converse of the existing PermitOpen directive and this
includes some refactoring to share much of its implementation.

feedback and ok markus@

Revision 1.380 / (download) - annotate - [select for diffs], Tue Apr 10 00:10:49 2018 UTC (6 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.379: +4 -4 lines
Diff to previous 1.379 (colored)

lots of typos in comments/docs. Patch from Karsten Weiss after checking
with codespell tool (https://github.com/lucasdemarchi/codespell)

Revision 1.379 / (download) - annotate - [select for diffs], Mon Feb 5 05:36:49 2018 UTC (6 years, 3 months ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.378: +9 -4 lines
Diff to previous 1.378 (colored)

The file descriptors for socket, stdin, stdout and stderr aren't
necessarily distinct, so check if they are the same to avoid closing
the same fd several times.

ok djm

Revision 1.378 / (download) - annotate - [select for diffs], Tue Jan 23 05:27:21 2018 UTC (6 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.377: +15 -30 lines
Diff to previous 1.377 (colored)

Drop compatibility hacks for some ancient SSH implementations, including
ssh.com <=2.* and OpenSSH <= 3.*.

These versions were all released in or before 2001 and predate the
final SSH RFCs. The hacks in question aren't necessary for RFC-
compliant SSH implementations.

ok markus@

Revision 1.377 / (download) - annotate - [select for diffs], Tue Dec 5 01:30:19 2017 UTC (6 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.376: +7 -4 lines
Diff to previous 1.376 (colored)

include the addr:port in bind/listen failure messages

Revision 1.376 / (download) - annotate - [select for diffs], Wed Oct 25 00:15:35 2017 UTC (6 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.375: +3 -16 lines
Diff to previous 1.375 (colored)

Add optional rdomain qualifier to sshd_config's ListenAddress option
to allow listening on a different rdomain(4), e.g.

ListenAddress 0.0.0.0 rdomain 4

Revision 1.375 / (download) - annotate - [select for diffs], Sun Sep 24 13:45:34 2017 UTC (6 years, 7 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.374: +2 -2 lines
Diff to previous 1.374 (colored)

fix inverted test on channel open failure path that "upgraded" a
transient failure into a fatal error; reported by sthen and also seen
by benno@; ok sthen@

Revision 1.374 / (download) - annotate - [select for diffs], Sun Sep 24 09:50:01 2017 UTC (6 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.373: +2 -2 lines
Diff to previous 1.373 (colored)

write the correct buffer when tunnel forwarding; doesn't matter
on OpenBSD (they are the same) but does matter on portable where
we use an output filter to translate os-specific tun/tap headers

Revision 1.373 / (download) - annotate - [select for diffs], Sat Sep 23 22:04:07 2017 UTC (6 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.372: +8 -7 lines
Diff to previous 1.372 (colored)

fix tunnel forwarding problem introduced in refactor; reported by
stsp@ ok markus@

Revision 1.372 / (download) - annotate - [select for diffs], Thu Sep 21 19:16:53 2017 UTC (6 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.371: +289 -85 lines
Diff to previous 1.371 (colored)

Add 'reverse' dynamic forwarding which combines dynamic forwarding
(-D) with remote forwarding (-R) where the remote-forwarded port
expects SOCKS-requests.

The SSH server code is unchanged and the parsing happens at the SSH
clients side. Thus the full SOCKS-request is sent over the forwarded
channel and the client parses c->output. Parsing happens in
channel_before_prepare_select(), _before_ the select bitmask is
computed in the pre[] handlers, but after network input processing
in the post[] handlers.

help and ok djm@

Revision 1.371 / (download) - annotate - [select for diffs], Tue Sep 19 12:10:30 2017 UTC (6 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.370: +2 -2 lines
Diff to previous 1.370 (colored)

Use explicit_bzero() instead of bzero() before free() to prevent
the compiler from optimizing away the bzero() call.  OK djm@

Revision 1.370 / (download) - annotate - [select for diffs], Tue Sep 12 07:55:48 2017 UTC (6 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.369: +3 -3 lines
Diff to previous 1.369 (colored)

unused variable

Revision 1.369 / (download) - annotate - [select for diffs], Tue Sep 12 07:32:04 2017 UTC (6 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.368: +2 -1 lines
Diff to previous 1.368 (colored)

fix tun/tap forwarding case in previous

Revision 1.368 / (download) - annotate - [select for diffs], Tue Sep 12 06:35:31 2017 UTC (6 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.367: +30 -10 lines
Diff to previous 1.367 (colored)

Make remote channel ID a u_int

Previously we tracked the remote channel IDs in an int, but this is
strictly incorrect: the wire protocol uses uint32 and there is nothing
in-principle stopping a SSH implementation from sending, say, 0xffff0000.

In practice everyone numbers their channels sequentially, so this has
never been a problem.

ok markus@

Revision 1.367 / (download) - annotate - [select for diffs], Tue Sep 12 06:32:07 2017 UTC (6 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.366: +1629 -1348 lines
Diff to previous 1.366 (colored)

refactor channels.c

Move static state to a "struct ssh_channels" that is allocated at
runtime and tracked as a member of struct ssh.

Explicitly pass "struct ssh" to all channels functions.

Replace use of the legacy packet APIs in channels.c.

Rework sshd_config PermitOpen handling: previously the configuration
parser would call directly into the channels layer. After the refactor
this is not possible, as the channels structures are allocated at
connection time and aren't available when the configuration is parsed.
The server config parser now tracks PermitOpen itself and explicitly
configures the channels code later.

ok markus@

Revision 1.366 / (download) - annotate - [select for diffs], Wed Aug 30 03:59:08 2017 UTC (6 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.365: +9 -9 lines
Diff to previous 1.365 (colored)

pass packet state down to some of the channels function (more
to come...); ok markus@

Revision 1.365 / (download) - annotate - [select for diffs], Wed May 31 08:58:52 2017 UTC (6 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.364: +1 -3 lines
Diff to previous 1.364 (colored)

These shutdown() SHUT_RDWR are not needed before close()
ok djm markus claudio

Revision 1.364 / (download) - annotate - [select for diffs], Wed May 31 00:43:04 2017 UTC (6 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.363: +10 -6 lines
Diff to previous 1.363 (colored)

fix possible OOB strlen() in SOCKS4A hostname parsing; ok markus@

Revision 1.363 / (download) - annotate - [select for diffs], Tue May 30 14:23:52 2017 UTC (6 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.362: +18 -19 lines
Diff to previous 1.362 (colored)

protocol handlers all get struct ssh passed; ok djm@

Revision 1.362 / (download) - annotate - [select for diffs], Tue May 30 08:49:58 2017 UTC (6 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.361: +2 -2 lines
Diff to previous 1.361 (colored)

remove ssh1 references; ok djm@

Revision 1.361 / (download) - annotate - [select for diffs], Fri May 26 19:35:50 2017 UTC (6 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.360: +1 -11 lines
Diff to previous 1.360 (colored)

remove SSH_CHANNEL_XXX_DRAINING (ssh1 only); ok djm@

Revision 1.360 / (download) - annotate - [select for diffs], Fri May 26 19:34:12 2017 UTC (6 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.359: +1 -22 lines
Diff to previous 1.359 (colored)

remove channel_input_close_confirmation (ssh1 only); ok djm@

Revision 1.359 / (download) - annotate - [select for diffs], Sun Apr 30 23:28:41 2017 UTC (7 years ago) by djm
Branch: MAIN
Changes since 1.358: +1 -162 lines
Diff to previous 1.358 (colored)

obliterate ssh1.h and some dead code that used it

ok markus@

Revision 1.358 / (download) - annotate - [select for diffs], Sun Apr 30 23:13:25 2017 UTC (7 years ago) by djm
Branch: MAIN
Changes since 1.357: +129 -392 lines
Diff to previous 1.357 (colored)

remove compat20/compat13/compat15 variables

ok markus@

Revision 1.357 / (download) - annotate - [select for diffs], Wed Feb 1 02:59:09 2017 UTC (7 years, 3 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.356: +26 -7 lines
Diff to previous 1.356 (colored)

Return true reason for port forwarding failures where feasible rather
than always "administratively prohibited".  bz#2674, ok djm@

Revision 1.356 / (download) - annotate - [select for diffs], Tue Oct 18 17:32:54 2016 UTC (7 years, 6 months ago) by dtucker
Branch: MAIN
Changes since 1.355: +1 -38 lines
Diff to previous 1.355 (colored)

Remove channel_input_port_forward_request(); the only caller was the
recently-removed SSH1 server code so it's now dead code.  ok markus@

Revision 1.355 / (download) - annotate - [select for diffs], Fri Sep 30 20:24:46 2016 UTC (7 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.354: +9 -3 lines
Diff to previous 1.354 (colored)

fix some -Wpointer-sign warnings in the new mux proxy; ok markus@

Revision 1.354 / (download) - annotate - [select for diffs], Fri Sep 30 09:19:13 2016 UTC (7 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.353: +380 -12 lines
Diff to previous 1.353 (colored)

ssh proxy mux mode (-O proxy; idea from Simon Tatham):
- mux client speaks the ssh-packet protocol directly over unix-domain socket.
- mux server acts as a proxy, translates channel IDs and relays to the server.
- no filedescriptor passing necessary.
- combined with unix-domain forwarding it's even possible to run mux client
  and server on different machines.
feedback & ok djm@

Revision 1.353 / (download) - annotate - [select for diffs], Mon Sep 19 07:52:42 2016 UTC (7 years, 7 months ago) by natano
Branch: MAIN
Changes since 1.352: +7 -11 lines
Diff to previous 1.352 (colored)

Replace two more arc4random() loops with arc4random_buf().

tweaks and ok dtucker
ok deraadt

Revision 1.352 / (download) - annotate - [select for diffs], Mon Sep 12 01:22:38 2016 UTC (7 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.351: +10 -11 lines
Diff to previous 1.351 (colored)

Add MAXIMUM(), MINIMUM(), and ROUNDUP() to misc.h, then use those definitions
rather than pulling <sys/param.h> and unknown namespace pollution.
ok djm markus dtucker

Revision 1.351 / (download) - annotate - [select for diffs], Tue Jul 19 11:38:53 2016 UTC (7 years, 9 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.350: +6 -2 lines
Diff to previous 1.350 (colored)

Allow wildcard for PermitOpen hosts as well as ports.  bz#2582, patch from
openssh at mzpqnxow.com and jjelen at redhat.com.  ok markus@

Revision 1.350 / (download) - annotate - [select for diffs], Mon Mar 7 19:02:43 2016 UTC (8 years, 2 months ago) by djm
Branch: MAIN
Changes since 1.349: +3 -3 lines
Diff to previous 1.349 (colored)

refactor canohost.c: move functions that cache results closer to the
places that use them (authn and session code). After this, no state is
cached in canohost.c

feedback and ok markus@

Revision 1.349 / (download) - annotate - [select for diffs], Fri Feb 5 13:28:19 2016 UTC (8 years, 3 months ago) by naddy
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.348: +7 -7 lines
Diff to previous 1.348 (colored)

Only check errno if read() has returned an error.  EOF is not an error.
This fixes a problem where the mux master would sporadically fail to
notice that the client had exited.
ok mikeb@ djm@

Revision 1.348 / (download) - annotate - [select for diffs], Thu Oct 15 23:51:40 2015 UTC (8 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.347: +2 -2 lines
Diff to previous 1.347 (colored)

fix some signed/unsigned integer type mismatches in format
strings; reported by Nicholas Lemonias

Revision 1.347 / (download) - annotate - [select for diffs], Wed Jul 1 02:26:31 2015 UTC (8 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.346: +17 -1 lines
Diff to previous 1.346 (colored)

better refuse ForwardX11Trusted=no connections attempted after
ForwardX11Timeout expires; reported by Jann Horn

Revision 1.346 / (download) - annotate - [select for diffs], Tue Jun 30 05:25:07 2015 UTC (8 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.345: +6 -3 lines
Diff to previous 1.345 (colored)

fatal() when a remote window update causes the window value to
overflow. Reported by Georg Wicherski, ok markus@

Revision 1.345 / (download) - annotate - [select for diffs], Tue Jun 30 05:23:25 2015 UTC (8 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.344: +2 -2 lines
Diff to previous 1.344 (colored)

Fix math error in remote window calculations that causes eventual stalls
for datagram channels. Reported by Georg Wicherski, ok markus@

Revision 1.344 / (download) - annotate - [select for diffs], Fri Jun 5 15:13:13 2015 UTC (8 years, 11 months ago) by millert
Branch: MAIN
Changes since 1.343: +14 -10 lines
Diff to previous 1.343 (colored)

For "ssh -L 12345:/tmp/sock" don't fail with "No forward host name."
(we have a path, not a host name).  Based on a diff from Jared Yanovich.
OK djm@

Revision 1.343 / (download) - annotate - [select for diffs], Fri May 8 03:25:07 2015 UTC (9 years ago) by dtucker
Branch: MAIN
Changes since 1.342: +2 -2 lines
Diff to previous 1.342 (colored)

Use xcalloc for permitted_adm_opens instead of xmalloc to ensure it's zeroed.
Fixes post-auth crash with permitopen=none.  bz#2355, ok djm@

Revision 1.342 / (download) - annotate - [select for diffs], Fri Apr 24 01:36:00 2015 UTC (9 years ago) by deraadt
Branch: MAIN
Changes since 1.341: +7 -7 lines
Diff to previous 1.341 (colored)

rename xrealloc() to xreallocarray() since it follows that form.
ok djm

Revision 1.341 / (download) - annotate - [select for diffs], Fri Feb 6 23:21:59 2015 UTC (9 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.340: +3 -3 lines
Diff to previous 1.340 (colored)

SIZE_MAX is standard, we should be using it in preference to the
obsolete SIZE_T_MAX.  OK miod@ beck@

Revision 1.340 / (download) - annotate - [select for diffs], Tue Jan 20 23:14:00 2015 UTC (9 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.339: +3 -2 lines
Diff to previous 1.339 (colored)

Reduce use of <sys/param.h> and transition to <limits.h> throughout.
ok djm markus

Revision 1.339 / (download) - annotate - [select for diffs], Mon Jan 19 20:07:45 2015 UTC (9 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.338: +37 -26 lines
Diff to previous 1.338 (colored)

move dispatch to struct ssh; ok djm@

Revision 1.338 / (download) - annotate - [select for diffs], Thu Dec 11 08:20:09 2014 UTC (9 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.337: +2 -1 lines
Diff to previous 1.337 (colored)

explicitly include sys/param.h in files that use the howmany() macro;
from portable

Revision 1.337 / (download) - annotate - [select for diffs], Wed Oct 8 22:15:06 2014 UTC (9 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.336: +5 -5 lines
Diff to previous 1.336 (colored)

fix a few -Wpointer-sign warnings from clang

Revision 1.336 / (download) - annotate - [select for diffs], Tue Jul 15 15:54:14 2014 UTC (9 years, 10 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.335: +483 -117 lines
Diff to previous 1.335 (colored)

Add support for Unix domain socket forwarding.  A remote TCP port
may be forwarded to a local Unix domain socket and vice versa or
both ends may be a Unix domain socket.  This is a reimplementation
of the streamlocal patches by William Ahern from:
    http://www.25thandclement.com/~william/projects/streamlocal.html
OK djm@ markus@

Revision 1.335 / (download) - annotate - [select for diffs], Sat Jul 5 23:11:48 2014 UTC (9 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.334: +4 -1 lines
Diff to previous 1.334 (colored)

fix remote-forward cancel regression; ok markus@

Revision 1.334 / (download) - annotate - [select for diffs], Thu Jul 3 22:33:41 2014 UTC (9 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.333: +15 -3 lines
Diff to previous 1.333 (colored)

allow explicit ::1 and 127.0.0.1 forwarding bind addresses when
GatewayPorts=no; allows client to choose address family;
bz#2222 ok markus@

Revision 1.333 / (download) - annotate - [select for diffs], Fri Jun 27 16:41:56 2014 UTC (9 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.332: +70 -26 lines
Diff to previous 1.332 (colored)

fix remote fwding with same listen port but different listen address
with gerhard@, ok djm@

Revision 1.332 / (download) - annotate - [select for diffs], Mon Apr 28 03:09:18 2014 UTC (10 years ago) by djm
Branch: MAIN
Changes since 1.331: +2 -2 lines
Diff to previous 1.331 (colored)

buffer_get_string_ptr's return should be const to remind
callers that futzing with it will futz with the actual buffer
contents

Revision 1.331 / (download) - annotate - [select for diffs], Wed Feb 26 20:29:29 2014 UTC (10 years, 2 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.330: +4 -1 lines
Diff to previous 1.330 (colored)

don't assume that the socks4 username is \0 terminated;
spotted by Ben Hawkes; ok markus@

Revision 1.330 / (download) - annotate - [select for diffs], Sat Feb 15 23:05:36 2014 UTC (10 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.329: +2 -2 lines
Diff to previous 1.329 (colored)

avoid spurious "getsockname failed: Bad file descriptor" errors in ssh -W;
bz#2200, debian#738692 via Colin Watson; ok dtucker@

Revision 1.329 / (download) - annotate - [select for diffs], Fri Jan 31 16:39:19 2014 UTC (10 years, 3 months ago) by tedu
Branch: MAIN
Changes since 1.328: +4 -6 lines
Diff to previous 1.328 (colored)

replace most bzero with explicit_bzero, except a few that cna be memset
ok djm dtucker

Revision 1.328 / (download) - annotate - [select for diffs], Thu Dec 19 01:04:36 2013 UTC (10 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.327: +7 -4 lines
Diff to previous 1.327 (colored)

bz#2147: fix multiple remote forwardings with dynamically assigned
listen ports. In the s->c message to open the channel we were sending
zero (the magic number to request a dynamic port) instead of the actual
listen port. The client therefore had no way of discriminating between
them.

Diagnosis and fix by ronf AT timeheart.net

Revision 1.319.2.1 / (download) - annotate - [select for diffs], Fri Nov 8 05:52:21 2013 UTC (10 years, 6 months ago) by djm
Branch: OPENBSD_5_3
Changes since 1.319: +2 -2 lines
Diff to previous 1.319 (colored) next main 1.320 (colored)

openssh-6.4 for the 5.3 branch; reminded by deraadt@

Revision 1.324.2.1 / (download) - annotate - [select for diffs], Fri Nov 8 01:33:56 2013 UTC (10 years, 6 months ago) by djm
Branch: OPENBSD_5_4
Changes since 1.324: +2 -2 lines
Diff to previous 1.324 (colored) next main 1.325 (colored)

cherrypick commit:

date: 2013/11/08 00:39:15;  author: djm;  state: Exp;  lines: +2 -2;
use calloc for all structure allocations; from markus@

Revision 1.327 / (download) - annotate - [select for diffs], Fri Nov 8 00:39:15 2013 UTC (10 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.326: +2 -2 lines
Diff to previous 1.326 (colored)

use calloc for all structure allocations; from markus@

Revision 1.326 / (download) - annotate - [select for diffs], Thu Sep 19 01:24:46 2013 UTC (10 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.325: +14 -2 lines
Diff to previous 1.325 (colored)

bz#1297 - tell the client (via packet_send_debug) when their preferred
listen address has been overridden by the server's GatewayPorts;
ok dtucker@

Revision 1.325 / (download) - annotate - [select for diffs], Fri Sep 13 06:54:34 2013 UTC (10 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.324: +2 -3 lines
Diff to previous 1.324 (colored)

avoid unaligned access in code that reused a buffer to send a
struct in_addr in a reply; simpler just use use buffer_put_int();
from portable; spotted by and ok dtucker@

Revision 1.324 / (download) - annotate - [select for diffs], Fri Jul 12 00:19:58 2013 UTC (10 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE
Branch point for: OPENBSD_5_4
Changes since 1.323: +4 -3 lines
Diff to previous 1.323 (colored)

fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@

Revision 1.323 / (download) - annotate - [select for diffs], Fri Jun 7 15:37:52 2013 UTC (10 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.322: +6 -2 lines
Diff to previous 1.322 (colored)

Add an "ABANDONED" channel state and use for mux sessions that are
disconnected via the ~. escape sequence.  Channels in this state will
be able to close if the server responds, but do not count as active channels.
This means that if you ~. all of the mux clients when using ControlPersist
on a broken network, the backgrounded mux master will exit when the
Control Persist time expires rather than hanging around indefinitely.
bz#1917, also reported and tested by tedu@.  ok djm@ markus@.

Revision 1.322 / (download) - annotate - [select for diffs], Sat Jun 1 13:15:51 2013 UTC (10 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.321: +6 -6 lines
Diff to previous 1.321 (colored)

Use clock_gettime(CLOCK_MONOTONIC ...) for ssh timers so that things like
keepalives and rekeying will work properly over clock steps.  Suggested by
markus@, "looks good" djm@.

Revision 1.321 / (download) - annotate - [select for diffs], Fri May 17 00:13:13 2013 UTC (11 years ago) by djm
Branch: MAIN
Changes since 1.320: +40 -58 lines
Diff to previous 1.320 (colored)

bye, bye xfree(); ok markus@

Revision 1.320 / (download) - annotate - [select for diffs], Sat Apr 6 16:07:00 2013 UTC (11 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.319: +10 -4 lines
Diff to previous 1.319 (colored)

handle ECONNABORTED for accept(); ok deraadt some time ago...

Revision 1.319 / (download) - annotate - [select for diffs], Sun Dec 2 20:46:11 2012 UTC (11 years, 5 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE
Branch point for: OPENBSD_5_3
Changes since 1.318: +5 -7 lines
Diff to previous 1.318 (colored)

make AllowTcpForwarding accept "local" and "remote" in addition to its
current "yes"/"no" to allow the server to specify whether just local or
remote TCP forwarding is enabled. ok markus@

Revision 1.318 / (download) - annotate - [select for diffs], Mon Apr 23 08:18:17 2012 UTC (12 years ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.317: +2 -2 lines
Diff to previous 1.317 (colored)

fix function proto/source mismatch

Revision 1.317 / (download) - annotate - [select for diffs], Wed Apr 11 13:16:19 2012 UTC (12 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.316: +44 -8 lines
Diff to previous 1.316 (colored)

don't spin in accept() when out of fds (ENFILE/ENFILE) - back off for a
while; ok deraadt@ markus@

Revision 1.316 / (download) - annotate - [select for diffs], Thu Mar 29 23:54:36 2012 UTC (12 years, 1 month ago) by dtucker
Branch: MAIN
Changes since 1.315: +15 -2 lines
Diff to previous 1.315 (colored)

Add PermitOpen none option based on patch from Loganaden Velvindron
(bz #1949).  ok djm@

Revision 1.315 / (download) - annotate - [select for diffs], Fri Sep 23 07:45:05 2011 UTC (12 years, 7 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.314: +43 -8 lines
Diff to previous 1.314 (colored)

unbreak remote portforwarding with dynamic allocated listen ports:
1) send the actual listen port in the open message (instead of 0).
   this allows multiple forwardings with a dynamic listen port
2) update the matching permit-open entry, so we can identify where
   to connect to
report: den at skbkontur.ru and P. Szczygielski
feedback and ok djm@

Revision 1.314 / (download) - annotate - [select for diffs], Fri Sep 23 00:22:04 2011 UTC (12 years, 7 months ago) by dtucker
Branch: MAIN
Changes since 1.313: +29 -4 lines
Diff to previous 1.313 (colored)

Add wildcard support to PermitOpen, allowing things like "PermitOpen
localhost:*".  bz #1857, ok djm markus.

Revision 1.313 / (download) - annotate - [select for diffs], Sat Sep 10 22:26:34 2011 UTC (12 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.312: +11 -3 lines
Diff to previous 1.312 (colored)

support cancellation of local/dynamic forwardings from ~C commandline;
ok & feedback djm@

Revision 1.312 / (download) - annotate - [select for diffs], Fri Sep 9 22:46:44 2011 UTC (12 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.311: +109 -55 lines
Diff to previous 1.311 (colored)

support for cancelling local and remote port forwards via the multiplex
socket. Use ssh -O cancel -L xx:xx:xx -R yy:yy:yy user@host" to request
the cancellation of the specified forwardings; ok markus@

Revision 1.311 / (download) - annotate - [select for diffs], Wed Jun 22 22:08:42 2011 UTC (12 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.310: +3 -3 lines
Diff to previous 1.310 (colored)

hook up a channel confirm callback to warn the user then requested X11
forwarding was refused by the server; ok markus@

Revision 1.310 / (download) - annotate - [select for diffs], Wed Nov 24 01:24:14 2010 UTC (13 years, 5 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.309: +1 -4 lines
Diff to previous 1.309 (colored)

remove a debug() that pollutes stderr on client connecting to a server
in debug mode (channel_close_fds is called transitively from the session
code post-fork); bz#1719, ok dtucker

Revision 1.309 / (download) - annotate - [select for diffs], Thu Aug 5 13:08:42 2010 UTC (13 years, 9 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.308: +26 -15 lines
Diff to previous 1.308 (colored)

Fix a trio of bugs in the local/remote window calculation for datagram
data channels (i.e. TunnelForward):

Calculate local_consumed correctly in channel_handle_wfd() by measuring
the delta to buffer_len(c->output) from when we start to when we finish.
The proximal problem here is that the output_filter we use in portable
modified the length of the dequeued datagram (to futz with the headers
for !OpenBSD).

In channel_output_poll(), don't enqueue datagrams that won't fit in the
peer's advertised packet size (highly unlikely to ever occur) or which
won't fit in the peer's remaining window (more likely).

In channel_input_data(), account for the 4-byte string header in
datagram packets that we accept from the peer and enqueue in c->output.

report, analysis and testing 2/3 cases from wierbows AT us.ibm.com;
"looks good" markus@

Revision 1.308 / (download) - annotate - [select for diffs], Tue Jul 13 23:13:16 2010 UTC (13 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.307: +2 -2 lines
Diff to previous 1.307 (colored)

s/timing_safe_cmp/timingsafe_bcmp/g

Revision 1.307 / (download) - annotate - [select for diffs], Tue Jul 13 11:52:06 2010 UTC (13 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.306: +2 -2 lines
Diff to previous 1.306 (colored)

implement a timing_safe_cmp() function to compare memory without leaking
timing information by short-circuiting like memcmp() and use it for
some of the more sensitive comparisons (though nothing high-value was
readily attackable anyway); "looks ok" markus@

Revision 1.306 / (download) - annotate - [select for diffs], Fri Jun 25 07:20:04 2010 UTC (13 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.305: +12 -5 lines
Diff to previous 1.305 (colored)

bz#1750: fix requirement for /dev/null inside ChrootDirectory for
internal-sftp accidentally introduced in r1.253 by removing the code
that opens and dup /dev/null to stderr and modifying the channels code
to read stderr but discard it instead; ok markus@

Revision 1.305 / (download) - annotate - [select for diffs], Fri Jun 25 07:14:45 2010 UTC (13 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.304: +18 -11 lines
Diff to previous 1.304 (colored)

bz#1327: remove hardcoded limit of 100 permitopen clauses and port
forwards per direction; ok markus@ stevesk@

Revision 1.304 / (download) - annotate - [select for diffs], Fri May 14 23:29:23 2010 UTC (14 years ago) by djm
Branch: MAIN
Changes since 1.303: +11 -5 lines
Diff to previous 1.303 (colored)

Pause the mux channel while waiting for reply from aynch callbacks.
Prevents misordering of replies if new requests arrive while waiting.

Extend channel open confirm callback to allow signalling failure
conditions as well as success. Use this to 1) fix a memory leak, 2)
start using the above pause mechanism and 3) delay sending a success/
failure message on mux slave session open until we receive a reply from
the server.

motivated by and with feedback from markus@

Revision 1.303 / (download) - annotate - [select for diffs], Sat Jan 30 21:12:08 2010 UTC (14 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.302: +8 -1 lines
Diff to previous 1.302 (colored)

fake local addr:port when stdio fowarding as some servers (Tectia at
least) validate that they are well-formed;
reported by imorgan AT nas.nasa.gov
ok dtucker

Revision 1.302 / (download) - annotate - [select for diffs], Tue Jan 26 01:28:35 2010 UTC (14 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.301: +164 -48 lines
Diff to previous 1.301 (colored)

rewrite ssh(1) multiplexing code to a more sensible protocol.

The new multiplexing code uses channels for the listener and
accepted control sockets to make the mux master non-blocking, so
no stalls when processing messages from a slave.

avoid use of fatal() in mux master protocol parsing so an errant slave
process cannot take down a running master.

implement requesting of port-forwards over multiplexed sessions. Any
port forwards requested by the slave are added to those the master has
established.

add support for stdio forwarding ("ssh -W host:port ...") in mux slaves.

document master/slave mux protocol so that other tools can use it to
control a running ssh(1). Note: there are no guarantees that this
protocol won't be incompatibly changed (though it is versioned).

feedback Salvador Fandino, dtucker@
channel changes ok markus@

Revision 1.301 / (download) - annotate - [select for diffs], Mon Jan 11 01:39:46 2010 UTC (14 years, 4 months ago) by dtucker
Branch: MAIN
Changes since 1.300: +30 -1 lines
Diff to previous 1.300 (colored)

Add a 'netcat mode' (ssh -W).  This connects stdio on the client to a single
port forward on the server.  This allows, for example, using ssh as
a ProxyCommand to route connections via intermediate servers.
bz #1618, man page help from jmc@, ok markus@

Revision 1.300 / (download) - annotate - [select for diffs], Sat Jan 9 23:04:13 2010 UTC (14 years, 4 months ago) by dtucker
Branch: MAIN
Changes since 1.299: +7 -19 lines
Diff to previous 1.299 (colored)

Remove RoutingDomain from ssh since it's now not needed.  It can be replaced
with "route exec" or "nc -V" as a proxycommand.  "route exec" also ensures
that trafic such as DNS lookups stays withing the specified routingdomain.

For example (from reyk):
# route -T 2 exec /usr/sbin/sshd
or inherited from the parent process
$ route -T 2 exec sh
$ ssh 10.1.2.3

ok deraadt@ markus@ stevesk@ reyk@

Revision 1.299 / (download) - annotate - [select for diffs], Wed Nov 11 21:37:03 2009 UTC (14 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.298: +11 -15 lines
Diff to previous 1.298 (colored)

fix race condition in x11/agent channel allocation: don't read after
the end of the select read/write fdset and make sure a reused FD
is not touched before the pre-handlers are called.
with and ok djm@

Revision 1.298 / (download) - annotate - [select for diffs], Tue Nov 10 04:30:44 2009 UTC (14 years, 6 months ago) by dtucker
Branch: MAIN
Changes since 1.297: +8 -2 lines
Diff to previous 1.297 (colored)

Set close-on-exec on various descriptors so they don't get leaked to
child processes.  bz #1643, patch from jchadima at redhat, ok deraadt.

Revision 1.297 / (download) - annotate - [select for diffs], Wed Oct 28 16:38:18 2009 UTC (14 years, 6 months ago) by reyk
Branch: MAIN
Changes since 1.296: +19 -7 lines
Diff to previous 1.296 (colored)

Allow to set the rdomain in ssh/sftp/scp/sshd and ssh-keyscan.

ok markus@

Revision 1.296 / (download) - annotate - [select for diffs], Mon May 25 06:48:00 2009 UTC (14 years, 11 months ago) by andreas
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6
Changes since 1.295: +2 -2 lines
Diff to previous 1.295 (colored)

Put the globals in packet.c into a struct and don't access it directly
from other files. No functional changes.
ok markus@ djm@

Revision 1.295 / (download) - annotate - [select for diffs], Thu Feb 12 03:00:56 2009 UTC (15 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.294: +44 -8 lines
Diff to previous 1.294 (colored)

support remote port forwarding with a zero listen port (-R0:...) to
dyamically allocate a listen port at runtime (this is actually
specified in rfc4254); bz#1003 ok markus@

Revision 1.294 / (download) - annotate - [select for diffs], Thu Jan 22 09:49:57 2009 UTC (15 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.293: +3 -3 lines
Diff to previous 1.293 (colored)

oops! I committed the wrong version of the Channel->path diff,
it was missing some tweaks suggested by stevesk@

Revision 1.293 / (download) - annotate - [select for diffs], Thu Jan 22 09:46:01 2009 UTC (15 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.292: +35 -13 lines
Diff to previous 1.292 (colored)

make Channel->path an allocated string, saving a few bytes here and
there and fixing bz#1380 in the process; ok markus@

Revision 1.292 / (download) - annotate - [select for diffs], Wed Jan 14 01:38:06 2009 UTC (15 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.291: +39 -11 lines
Diff to previous 1.291 (colored)

support SOCKS4A protocol, from dwmw2 AT infradead.org via bz#1482;
"looks ok" markus@

Revision 1.291 / (download) - annotate - [select for diffs], Thu Jan 1 21:14:35 2009 UTC (15 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.290: +3 -3 lines
Diff to previous 1.290 (colored)

call channel destroy callbacks on receipt of open failure messages.
fixes client hangs when connecting to a server that has MaxSessions=0
set spotted by imorgan AT nas.nasa.gov; ok markus@

Revision 1.290 / (download) - annotate - [select for diffs], Tue Dec 9 03:20:42 2008 UTC (15 years, 5 months ago) by stevesk
Branch: MAIN
Changes since 1.289: +4 -2 lines
Diff to previous 1.289 (colored)

channel_print_adm_permitted_opens() should deal with all the printing
for that config option.  suggested by markus@; ok markus@ djm@
dtucker@

Revision 1.289 / (download) - annotate - [select for diffs], Tue Dec 2 19:09:38 2008 UTC (15 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.288: +6 -6 lines
Diff to previous 1.288 (colored)

s/remote_id/id/ to be more consistent with other code; ok djm@

Revision 1.288 / (download) - annotate - [select for diffs], Tue Nov 11 03:55:11 2008 UTC (15 years, 6 months ago) by stevesk
Branch: MAIN
Changes since 1.287: +5 -1 lines
Diff to previous 1.287 (colored)

for sshd -T print 'permitopen any' vs. 'permitopen' for case of no
permitopen's; ok and input dtucker@

Revision 1.287 / (download) - annotate - [select for diffs], Sat Nov 1 06:43:33 2008 UTC (15 years, 6 months ago) by stevesk
Branch: MAIN
Changes since 1.286: +4 -4 lines
Diff to previous 1.286 (colored)

fix some typos in log messages; ok djm@

Revision 1.286 / (download) - annotate - [select for diffs], Wed Jul 16 11:52:19 2008 UTC (15 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.285: +2 -2 lines
Diff to previous 1.285 (colored)

this loop index should be automatic, not static

Revision 1.285 / (download) - annotate - [select for diffs], Sun Jul 13 22:13:07 2008 UTC (15 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.284: +7 -7 lines
Diff to previous 1.284 (colored)

use struct sockaddr_storage instead of struct sockaddr for accept(2)
address argument. from visibilis AT yahoo.com in bz#1485; ok markus@

Revision 1.284 / (download) - annotate - [select for diffs], Sat Jul 12 04:52:50 2008 UTC (15 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.283: +2 -2 lines
Diff to previous 1.283 (colored)

unbreak; move clearing of cctx struct to before first use
reported by dkrause@

Revision 1.283 / (download) - annotate - [select for diffs], Thu Jul 10 18:05:58 2008 UTC (15 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.282: +2 -1 lines
Diff to previous 1.282 (colored)

missing bzero; from mickey; ok djm@

Revision 1.282 / (download) - annotate - [select for diffs], Mon Jun 16 13:22:53 2008 UTC (15 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.281: +5 -5 lines
Diff to previous 1.281 (colored)

Rename the isatty argument to is_tty so we don't shadow isatty(3).
ok markus@

Revision 1.281 / (download) - annotate - [select for diffs], Sun Jun 15 20:06:26 2008 UTC (15 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.280: +6 -15 lines
Diff to previous 1.280 (colored)

don't call isatty() on a pty master, instead pass a flag down to
channel_set_fds() indicating that te fds refer to a tty. Fixes a
hang on exit on Solaris (bz#1463) in portable but is actually
a generic bug; ok dtucker deraadt markus

Revision 1.280 / (download) - annotate - [select for diffs], Thu Jun 12 15:19:17 2008 UTC (15 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.279: +7 -2 lines
Diff to previous 1.279 (colored)

The multiplexing escape char handler commit last night introduced a
small memory leak per session; plug it.

Revision 1.279 / (download) - annotate - [select for diffs], Thu Jun 12 03:40:52 2008 UTC (15 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.278: +3 -2 lines
Diff to previous 1.278 (colored)

Enable ~ escapes for multiplex slave sessions; give each channel
its own escape state and hook the escape filters up to muxed
channels. bz #1331

Mux slaves do not currently support the ~^Z and ~& escapes.

NB. this change cranks the mux protocol version, so a new ssh
mux client will not be able to connect to a running old ssh
mux master.

ok dtucker@

Revision 1.278 / (download) - annotate - [select for diffs], Tue Jun 10 04:50:25 2008 UTC (15 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.277: +12 -1 lines
Diff to previous 1.277 (colored)

Add extended test mode (-T) and connection parameters for test mode (-C).
-T causes sshd to write its effective configuration to stdout and exit.
-C causes any relevant Match rules to be applied before output.  The
combination allows tesing of the parser and config files.  ok deraadt djm

Revision 1.277 / (download) - annotate - [select for diffs], Fri May 9 16:17:51 2008 UTC (16 years ago) by markus
Branch: MAIN
Changes since 1.276: +3 -2 lines
Diff to previous 1.276 (colored)

error-fd race: don't enable the error fd in the select bitmask
for channels with both in- and output closed, since the channel
will go away before we call select();
report, lots of debugging help and ok djm@

Revision 1.276 / (download) - annotate - [select for diffs], Fri May 9 04:55:56 2008 UTC (16 years ago) by djm
Branch: MAIN
Changes since 1.275: +110 -57 lines
Diff to previous 1.275 (colored)

Try additional addresses when connecting to a port forward destination
whose DNS name resolves to more than one address. The previous behaviour
was to try the first address and give up.

Reported by stig AT venaas.com in bz#343

great feedback and ok markus@

Revision 1.275 / (download) - annotate - [select for diffs], Thu May 8 12:02:23 2008 UTC (16 years ago) by djm
Branch: MAIN
Changes since 1.274: +64 -9 lines
Diff to previous 1.274 (colored)

Implement a channel success/failure status confirmation callback
mechanism. Each channel maintains a queue of callbacks, which will
be drained in order (RFC4253 guarantees confirm messages are not
reordered within an channel).

Also includes a abandonment callback to clean up if a channel is
closed without sending confirmation messages. This probably
shouldn't happen in compliant implementations, but it could be
abused to leak memory.

ok markus@ (as part of a larger diff)

Revision 1.274 / (download) - annotate - [select for diffs], Thu May 8 06:59:01 2008 UTC (16 years ago) by markus
Branch: MAIN
Changes since 1.273: +3 -6 lines
Diff to previous 1.273 (colored)

avoid extra malloc/copy/free when receiving data over the net;
~10% speedup for localhost-scp; ok djm@

Revision 1.272.2.1 / (download) - annotate - [select for diffs], Thu Apr 3 03:42:02 2008 UTC (16 years, 1 month ago) by brad
Branch: OPENBSD_4_3
Changes since 1.272: +1 -4 lines
Diff to previous 1.272 (colored) next main 1.273 (colored)

avoid possible hijacking of x11-forwarded connections (back out 1.183)
CVE-2008-1483; ok djm@

Revision 1.270.2.1 / (download) - annotate - [select for diffs], Thu Apr 3 03:41:40 2008 UTC (16 years, 1 month ago) by brad
Branch: OPENBSD_4_2
Changes since 1.270: +1 -4 lines
Diff to previous 1.270 (colored) next main 1.271 (colored)

avoid possible hijacking of x11-forwarded connections (back out 1.183)
CVE-2008-1483; ok djm@

Revision 1.268.2.1 / (download) - annotate - [select for diffs], Thu Apr 3 03:41:25 2008 UTC (16 years, 1 month ago) by brad
Branch: OPENBSD_4_1
Changes since 1.268: +1 -4 lines
Diff to previous 1.268 (colored) next main 1.269 (colored)

avoid possible hijacking of x11-forwarded connections (back out 1.183)
CVE-2008-1483; ok djm@

Revision 1.273 / (download) - annotate - [select for diffs], Wed Apr 2 21:36:51 2008 UTC (16 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.272: +1 -4 lines
Diff to previous 1.272 (colored)

avoid possible hijacking of x11-forwarded connections (back out 1.183)
CVE-2008-1483; ok djm@

Revision 1.272 / (download) - annotate - [select for diffs], Sat Jan 19 23:02:40 2008 UTC (16 years, 4 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE
Branch point for: OPENBSD_4_3
Changes since 1.271: +2 -2 lines
Diff to previous 1.271 (colored)

When we added support for specified bind addresses for port forwards, we
added a quirk SSH_OLD_FORWARD_ADDR. There is a bug in our handling of
this for -L port forwards that causes the client to listen on both v4
and v6 addresses when connected to a server with this quirk, despite
having set 0.0.0.0 as a bind_address.

report and patch from Jan.Pechanec AT Sun.COM; ok dtucker@

Revision 1.271 / (download) - annotate - [select for diffs], Thu Dec 27 14:22:08 2007 UTC (16 years, 4 months ago) by dtucker
Branch: MAIN
Changes since 1.270: +8 -6 lines
Diff to previous 1.270 (colored)

Add a small helper function to consistently handle the EAI_SYSTEM error
code of getaddrinfo.  Prompted by vgiffin at apple com via bz #1417.
ok markus@ stevesk@

Revision 1.270 / (download) - annotate - [select for diffs], Mon Jun 25 08:20:03 2007 UTC (16 years, 10 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE
Branch point for: OPENBSD_4_2
Changes since 1.269: +2 -2 lines
Diff to previous 1.269 (colored)

Correct test for window updates every three packets; prevents sending
window updates for every single packet.  ok markus@

Revision 1.269 / (download) - annotate - [select for diffs], Mon Jun 11 08:04:44 2007 UTC (16 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.268: +4 -2 lines
Diff to previous 1.268 (colored)

send 'window adjust' messages every tree packets and do not wait
until 50% of the window is consumed.  ok djm dtucker

Revision 1.268 / (download) - annotate - [select for diffs], Wed Jan 3 03:01:40 2007 UTC (17 years, 4 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE
Branch point for: OPENBSD_4_1
Changes since 1.267: +2 -2 lines
Diff to previous 1.267 (colored)

spaces

Revision 1.267 / (download) - annotate - [select for diffs], Tue Dec 12 03:58:42 2006 UTC (17 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.266: +13 -6 lines
Diff to previous 1.266 (colored)

bz #1019: some ssh.com versions apparently can't cope with the remote port
forwarding bind_address being a hostname, so send them an address for cases
where they are not explicitly specified (wildcard or localhost bind).
reported by daveroth AT acm.org; ok dtucker@ deraadt@

Revision 1.223.2.2 / (download) - annotate - [select for diffs], Fri Oct 6 03:19:32 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.223.2.1: +174 -92 lines
Diff to previous 1.223.2.1 (colored) to branchpoint 1.223 (colored) next main 1.224 (colored)

upgrade to OpenSSH 4.4

Revision 1.235.2.1 / (download) - annotate - [select for diffs], Sat Sep 30 04:06:50 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_9
Changes since 1.235: +170 -94 lines
Diff to previous 1.235 (colored) next main 1.236 (colored)

upgrade to OpenSSH 4.4

Revision 1.266 / (download) - annotate - [select for diffs], Tue Aug 29 10:40:18 2006 UTC (17 years, 8 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.265: +2 -4 lines
Diff to previous 1.265 (colored)

normalise some inconsistent (but harmless) NULL pointer checks
spotted by the Stanford SATURN tool, via Isil Dillig;
ok markus@ deraadt@

Revision 1.265 / (download) - annotate - [select for diffs], Thu Aug 3 03:34:41 2006 UTC (17 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.264: +5 -6 lines
Diff to previous 1.264 (colored)

almost entirely get rid of the culture of ".h files that include .h files"
ok djm, sort of ok stevesk
makes the pain stop in one easy step

Revision 1.264 / (download) - annotate - [select for diffs], Tue Aug 1 23:36:11 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.263: +2 -2 lines
Diff to previous 1.263 (colored)

clean extra spaces

Revision 1.263 / (download) - annotate - [select for diffs], Tue Aug 1 23:22:47 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.262: +2 -1 lines
Diff to previous 1.262 (colored)

move #include <stdio.h> out of includes.h

Revision 1.262 / (download) - annotate - [select for diffs], Wed Jul 26 13:57:17 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.261: +2 -1 lines
Diff to previous 1.261 (colored)

move #include <stdlib.h> out of includes.h

Revision 1.261 / (download) - annotate - [select for diffs], Tue Jul 25 02:59:21 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.260: +2 -1 lines
Diff to previous 1.260 (colored)

move #include <sys/time.h> out of includes.h

Revision 1.260 / (download) - annotate - [select for diffs], Sat Jul 22 20:48:22 2006 UTC (17 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.259: +2 -1 lines
Diff to previous 1.259 (colored)

move #include <string.h> out of includes.h

Revision 1.259 / (download) - annotate - [select for diffs], Fri Jul 21 21:13:30 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.258: +17 -1 lines
Diff to previous 1.258 (colored)

more ARGSUSED (lint) for dispatch table-driven functions; ok djm@

Revision 1.258 / (download) - annotate - [select for diffs], Fri Jul 21 12:43:36 2006 UTC (17 years, 10 months ago) by dtucker
Branch: MAIN
Changes since 1.257: +4 -4 lines
Diff to previous 1.257 (colored)

Make PermitOpen take a list of permitted ports and act more like most other
keywords (ie the first match is the effective setting).  This also makes it
easier to override a previously set PermitOpen.  ok djm@

Revision 1.257 / (download) - annotate - [select for diffs], Mon Jul 17 12:06:00 2006 UTC (17 years, 10 months ago) by dtucker
Branch: MAIN
Changes since 1.256: +45 -5 lines
Diff to previous 1.256 (colored)

Add PermitOpen directive to sshd_config which is equivalent to the
"permitopen" key option.  Allows server admin to allow TCP port forwarding
only two specific host/port pairs.  Useful when combined with Match.

If permitopen is used in both sshd_config and a key option, both must allow
a given connection before it will be permitted.

Note that users can still use external forwarders such as netcat, so to be
those must be controlled too for the limits to be effective.

Feedback & ok djm@, man page corrections & ok jmc@.

Revision 1.256 / (download) - annotate - [select for diffs], Mon Jul 17 01:31:09 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.255: +2 -1 lines
Diff to previous 1.255 (colored)

move #include <unistd.h> out of includes.h

Revision 1.255 / (download) - annotate - [select for diffs], Wed Jul 12 22:28:51 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.254: +2 -1 lines
Diff to previous 1.254 (colored)

move #include <netdb.h> out of includes.h; ok djm@

Revision 1.254 / (download) - annotate - [select for diffs], Tue Jul 11 20:07:25 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.253: +2 -1 lines
Diff to previous 1.253 (colored)

move #include <errno.h> out of includes.h; ok markus@

Revision 1.253 / (download) - annotate - [select for diffs], Tue Jul 11 18:50:47 2006 UTC (17 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.252: +10 -7 lines
Diff to previous 1.252 (colored)

add ExitOnForwardFailure: terminate the connection if ssh(1)
cannot set up all requested dynamic, local, and remote port
forwardings. ok djm, dtucker, stevesk, jmc

Revision 1.252 / (download) - annotate - [select for diffs], Mon Jul 10 12:08:08 2006 UTC (17 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.251: +6 -3 lines
Diff to previous 1.251 (colored)

fix misparsing of SOCKS 5 packets that could result in a crash;
reported by mk@ ok markus@

Revision 1.251 / (download) - annotate - [select for diffs], Mon Jul 3 17:59:32 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.250: +5 -1 lines
Diff to previous 1.250 (colored)

move #include <arpa/inet.h> out of includes.h; old ok djm@

Revision 1.250 / (download) - annotate - [select for diffs], Sun Apr 16 00:48:52 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.249: +3 -5 lines
Diff to previous 1.249 (colored)

Fix condition where we could exit with a fatal error when an input
buffer became too large and the remote end had advertised a big window.
The problem was a mismatch in the backoff math between the channels code
and the buffer code, so make a buffer_check_alloc() function that the
channels code can use to propsectivly check whether an incremental
allocation will succeed.  bz #1131, debugged with the assistance of
cove AT wildpackets.com; ok dtucker@ deraadt@

Revision 1.249 / (download) - annotate - [select for diffs], Thu Mar 30 09:41:25 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.248: +12 -1 lines
Diff to previous 1.248 (colored)

ARGSUSED for dispatch table-driven functions

Revision 1.248 / (download) - annotate - [select for diffs], Tue Mar 28 01:52:28 2006 UTC (18 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.247: +8 -8 lines
Diff to previous 1.247 (colored)

do not accept unreasonable X ports numbers; ok djm

Revision 1.247 / (download) - annotate - [select for diffs], Sat Mar 25 18:58:10 2006 UTC (18 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.246: +2 -2 lines
Diff to previous 1.246 (colored)

delete cast not required

Revision 1.246 / (download) - annotate - [select for diffs], Sat Mar 25 18:56:54 2006 UTC (18 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.245: +5 -5 lines
Diff to previous 1.245 (colored)

remove (char *) casts to a function that accepts void * for the arg

Revision 1.245 / (download) - annotate - [select for diffs], Sat Mar 25 18:43:30 2006 UTC (18 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.244: +2 -2 lines
Diff to previous 1.244 (colored)

use strtonum() instead of atoi() [limit X screens to 400, sorry]

Revision 1.244 / (download) - annotate - [select for diffs], Sat Mar 25 13:17:01 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.243: +1 -0 lines
Diff to previous 1.243 (colored)

Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
Theo nuked - our scripts to sync -portable need them in the files

Revision 1.243 / (download) - annotate - [select for diffs], Sat Mar 25 01:13:23 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.242: +11 -6 lines
Diff to previous 1.242 (colored)

change OpenSSH's xrealloc() function from being xrealloc(p, new_size) to
xrealloc(p, new_nmemb, new_itemsize).

realloc is particularly prone to integer overflows because it is almost
always allocating "n * size" bytes, so this is a far safer API;
ok deraadt@

Revision 1.242 / (download) - annotate - [select for diffs], Sat Mar 25 00:05:41 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.241: +3 -4 lines
Diff to previous 1.241 (colored)

introduce xcalloc() and xasprintf() failure-checked allocations functions
and use them throughout openssh

xcalloc is particularly important because malloc(nmemb * size) is a
dangerous idiom (subject to integer overflow) and it is time for it to
die

feedback and ok deraadt@

Revision 1.241 / (download) - annotate - [select for diffs], Mon Mar 20 18:48:34 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.240: +8 -14 lines
Diff to previous 1.240 (colored)

spacing

Revision 1.240 / (download) - annotate - [select for diffs], Mon Mar 20 18:35:12 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.239: +1 -1 lines
Diff to previous 1.239 (colored)

x11_fake_data is only ever used as u_char *

Revision 1.239 / (download) - annotate - [select for diffs], Mon Mar 20 18:26:55 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.238: +1 -1 lines
Diff to previous 1.238 (colored)

annoying spacing fixes getting in the way of real diffs

Revision 1.238 / (download) - annotate - [select for diffs], Mon Mar 20 18:14:02 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.237: +4 -4 lines
Diff to previous 1.237 (colored)

sprinkle u_int throughout pty subsystem, ok markus

Revision 1.237 / (download) - annotate - [select for diffs], Sun Mar 19 18:52:11 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.236: +25 -26 lines
Diff to previous 1.236 (colored)

spacing

Revision 1.236 / (download) - annotate - [select for diffs], Sun Mar 19 18:51:18 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.235: +0 -1 lines
Diff to previous 1.235 (colored)

RCSID() can die

Revision 1.235 / (download) - annotate - [select for diffs], Mon Feb 20 16:36:14 2006 UTC (18 years, 2 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE
Branch point for: OPENBSD_3_9
Changes since 1.234: +3 -1 lines
Diff to previous 1.234 (colored)

move #include <sys/un.h> out of includes.h; ok djm@

Revision 1.234 / (download) - annotate - [select for diffs], Fri Feb 10 00:27:13 2006 UTC (18 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.233: +3 -1 lines
Diff to previous 1.233 (colored)

move #include <sys/ioctl.h> out of includes.h; ok markus@

Revision 1.233 / (download) - annotate - [select for diffs], Tue Feb 7 01:42:00 2006 UTC (18 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.232: +3 -1 lines
Diff to previous 1.232 (colored)

move #include <termios.h> out of includes.h; ok markus@

Revision 1.223.2.1 / (download) - annotate - [select for diffs], Fri Feb 3 03:01:55 2006 UTC (18 years, 3 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.223: +130 -38 lines
Diff to previous 1.223 (colored)

upgrade to OpenSSH 4.3

Revision 1.214.2.2 / (download) - annotate - [select for diffs], Fri Feb 3 02:53:44 2006 UTC (18 years, 3 months ago) by brad
Branch: OPENBSD_3_7
Changes since 1.214.2.1: +130 -38 lines
Diff to previous 1.214.2.1 (colored) to branchpoint 1.214 (colored) next main 1.215 (colored)

upgrade to OpenSSH 4.3

Revision 1.232 / (download) - annotate - [select for diffs], Mon Jan 30 12:22:22 2006 UTC (18 years, 3 months ago) by reyk
Branch: MAIN
Changes since 1.231: +6 -2 lines
Diff to previous 1.231 (colored)

mark channel as write failed or dead instead of read failed on error
of the channel output filter.

ok markus@

Revision 1.231 / (download) - annotate - [select for diffs], Fri Dec 30 15:56:36 2005 UTC (18 years, 4 months ago) by reyk
Branch: MAIN
Changes since 1.230: +24 -13 lines
Diff to previous 1.230 (colored)

add channel output filter interface.

ok djm@, suggested by markus@

Revision 1.230 / (download) - annotate - [select for diffs], Wed Dec 28 22:46:06 2005 UTC (18 years, 4 months ago) by stevesk
Branch: MAIN
Changes since 1.229: +2 -2 lines
Diff to previous 1.229 (colored)

use 'break-in' for consistency; ok deraadt@ ok and input jmc@

Revision 1.229 / (download) - annotate - [select for diffs], Mon Dec 12 13:46:18 2005 UTC (18 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.228: +36 -9 lines
Diff to previous 1.228 (colored)

make sure protocol messages for internal channels are ignored.
allow adjust messages for non-open channels; with and ok djm@

Revision 1.228 / (download) - annotate - [select for diffs], Tue Dec 6 22:38:27 2005 UTC (18 years, 5 months ago) by reyk
Branch: MAIN
Changes since 1.227: +40 -2 lines
Diff to previous 1.227 (colored)

Add support for tun(4) forwarding over OpenSSH, based on an idea and
initial channel code bits by markus@. This is a simple and easy way to
use OpenSSH for ad hoc virtual private network connections, e.g.
administrative tunnels or secure wireless access. It's based on a new
ssh channel and works similar to the existing TCP forwarding support,
except that it depends on the tun(4) network interface on both ends of
the connection for layer 2 or layer 3 tunneling. This diff also adds
support for LocalCommand in the ssh(1) client.

ok djm@, markus@, jmc@ (manpages), tested and discussed with others

Revision 1.227 / (download) - annotate - [select for diffs], Fri Oct 14 02:29:37 2005 UTC (18 years, 7 months ago) by stevesk
Branch: MAIN
Changes since 1.226: +2 -2 lines
Diff to previous 1.226 (colored)

free()->xfree(); ok djm@

Revision 1.226 / (download) - annotate - [select for diffs], Tue Oct 11 23:37:37 2005 UTC (18 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.225: +18 -9 lines
Diff to previous 1.225 (colored)

bz #1076 set SO_REUSEADDR on X11 forwarding listner sockets, preventing
bind() failure when a previous connection's listeners are in TIME_WAIT,
reported by plattner AT inf.ethz.ch; ok dtucker@

Revision 1.225 / (download) - annotate - [select for diffs], Mon Oct 10 10:23:08 2005 UTC (18 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.224: +6 -3 lines
Diff to previous 1.224 (colored)

fix regression I introduced in 4.2: X11 forwardings initiated after
a session has exited (e.g. "(sleep 5; xterm) &") would not start.
bz #1086 reported by t8m AT centrum.cz; ok markus@ dtucker@

Revision 1.224 / (download) - annotate - [select for diffs], Wed Sep 7 08:53:53 2005 UTC (18 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.223: +7 -7 lines
Diff to previous 1.223 (colored)

enforce chanid != NULL; ok djm

Revision 1.214.2.1 / (download) - annotate - [select for diffs], Sun Sep 4 18:40:01 2005 UTC (18 years, 8 months ago) by brad
Branch: OPENBSD_3_7
Changes since 1.214: +60 -46 lines
Diff to previous 1.214 (colored)

upgrade to OpenSSH 4.2

Revision 1.210.2.3 / (download) - annotate - [select for diffs], Fri Sep 2 03:44:59 2005 UTC (18 years, 8 months ago) by brad
Branch: OPENBSD_3_6
Changes since 1.210.2.2: +60 -46 lines
Diff to previous 1.210.2.2 (colored) to branchpoint 1.210 (colored) next main 1.211 (colored)

upgrade to OpenSSH 4.2

Revision 1.223 / (download) - annotate - [select for diffs], Sun Jul 17 07:17:54 2005 UTC (18 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE
Branch point for: OPENBSD_3_8
Changes since 1.222: +5 -5 lines
Diff to previous 1.222 (colored)

knf says that a 2nd level indent is four (not three or five) spaces

Revision 1.222 / (download) - annotate - [select for diffs], Sun Jul 17 06:49:04 2005 UTC (18 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.221: +8 -2 lines
Diff to previous 1.221 (colored)

Fix a number of X11 forwarding channel leaks:
1. Refuse multiple X11 forwarding requests on the same session
2. Clean up all listeners after a single_connection X11 forward, not just
   the one that made the single connection
3. Destroy X11 listeners when the session owning them goes away
testing and ok dtucker@

Revision 1.221 / (download) - annotate - [select for diffs], Sat Jul 16 01:35:24 2005 UTC (18 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.220: +2 -2 lines
Diff to previous 1.220 (colored)

spacing

Revision 1.220 / (download) - annotate - [select for diffs], Mon Jul 4 14:04:11 2005 UTC (18 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.219: +4 -2 lines
Diff to previous 1.219 (colored)

don't forget to set x11_saved_display

Revision 1.219 / (download) - annotate - [select for diffs], Mon Jul 4 00:58:42 2005 UTC (18 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.218: +33 -26 lines
Diff to previous 1.218 (colored)

implement support for X11 and agent forwarding over multiplex slave
connections. Because of protocol limitations, the slave connections inherit
the master's DISPLAY and SSH_AUTH_SOCK rather than distinctly forwarding
their own.

ok dtucker@ "put it in" deraadt@

Revision 1.218 / (download) - annotate - [select for diffs], Fri Jul 1 13:19:47 2005 UTC (18 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.217: +5 -7 lines
Diff to previous 1.217 (colored)

don't free() if getaddrinfo() fails; report mpech@

Revision 1.217 / (download) - annotate - [select for diffs], Fri Jun 17 02:44:32 2005 UTC (18 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.216: +5 -4 lines
Diff to previous 1.216 (colored)

make this -Wsign-compare clean; ok avsm@ markus@

Revision 1.216 / (download) - annotate - [select for diffs], Thu Jun 16 08:00:00 2005 UTC (18 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.215: +3 -3 lines
Diff to previous 1.215 (colored)

don't exit if getpeername fails for forwarded ports; bugzilla #1054; ok djm

Revision 1.215 / (download) - annotate - [select for diffs], Thu Jun 16 03:38:36 2005 UTC (18 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.214: +5 -5 lines
Diff to previous 1.214 (colored)

move x11_get_proto from ssh.c to clientloop.c, to make muliplexed xfwd easier
later; ok deraadt@

Revision 1.210.2.2 / (download) - annotate - [select for diffs], Sun Jun 5 02:22:39 2005 UTC (18 years, 11 months ago) by brad
Branch: OPENBSD_3_6
Changes since 1.210.2.1: +16 -11 lines
Diff to previous 1.210.2.1 (colored) to branchpoint 1.210 (colored)

upgrade to OpenSSH 4.1

Revision 1.214 / (download) - annotate - [select for diffs], Mon Mar 14 11:46:56 2005 UTC (19 years, 2 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE
Branch point for: OPENBSD_3_7
Changes since 1.213: +8 -3 lines
Diff to previous 1.213 (colored)

limit input buffer size for channels; bugzilla #896; with and ok dtucker@

Revision 1.213 / (download) - annotate - [select for diffs], Thu Mar 10 22:01:05 2005 UTC (19 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.212: +9 -9 lines
Diff to previous 1.212 (colored)

spacing

Revision 1.200.2.2 / (download) - annotate - [select for diffs], Thu Mar 10 17:15:04 2005 UTC (19 years, 2 months ago) by brad
Branch: OPENBSD_3_5
Changes since 1.200.2.1: +69 -17 lines
Diff to previous 1.200.2.1 (colored) to branchpoint 1.200 (colored) next main 1.201 (colored)

upgrade to OpenSSH 4.0

Revision 1.210.2.1 / (download) - annotate - [select for diffs], Thu Mar 10 16:28:27 2005 UTC (19 years, 2 months ago) by brad
Branch: OPENBSD_3_6
Changes since 1.210: +68 -16 lines
Diff to previous 1.210 (colored)

upgrade to OpenSSH 4.0

Revision 1.212 / (download) - annotate - [select for diffs], Tue Mar 1 10:09:52 2005 UTC (19 years, 2 months ago) by djm
Branch: MAIN
Changes since 1.211: +67 -15 lines
Diff to previous 1.211 (colored)

bz#413: allow optional specification of bind address for port forwardings.
Patch originally by Dan Astorian, but worked on by several people
Adds GatewayPorts=clientspecified option on server to allow remote forwards
to bind to client-specified ports.

ok markus@

Revision 1.211 / (download) - annotate - [select for diffs], Fri Oct 29 21:47:15 2004 UTC (19 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.210: +2 -2 lines
Diff to previous 1.210 (colored)

fix some window size change bugs for multiplexed connections: windows sizes
were not being updated if they had changed after ~^Z suspends and SIGWINCH
was not being processed unless the first connection had requested a tty;
ok markus

Revision 1.210 / (download) - annotate - [select for diffs], Mon Aug 23 11:48:47 2004 UTC (19 years, 8 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE
Branch point for: OPENBSD_3_6
Changes since 1.209: +2 -2 lines
Diff to previous 1.209 (colored)

typo, spotted by Martin.Kraemer AT Fujitsu-Siemens.com; ok markus

Revision 1.195.2.2 / (download) - annotate - [select for diffs], Thu Aug 19 22:37:30 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.195.2.1: +159 -39 lines
Diff to previous 1.195.2.1 (colored) to branchpoint 1.195 (colored) next main 1.196 (colored)

upgrade to OpenSSH 3.9

Revision 1.200.2.1 / (download) - annotate - [select for diffs], Thu Aug 19 04:13:26 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_5
Changes since 1.200: +159 -39 lines
Diff to previous 1.200 (colored)

upgrade to OpenSSH 3.9

Revision 1.209 / (download) - annotate - [select for diffs], Wed Aug 11 21:43:04 2004 UTC (19 years, 9 months ago) by avsm
Branch: MAIN
Changes since 1.208: +24 -23 lines
Diff to previous 1.208 (colored)

some signed/unsigned int comparison cleanups; markus@ ok

Revision 1.208 / (download) - annotate - [select for diffs], Sun Jul 11 17:48:47 2004 UTC (19 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.207: +5 -6 lines
Diff to previous 1.207 (colored)

spaces

Revision 1.207 / (download) - annotate - [select for diffs], Mon Jun 21 17:36:31 2004 UTC (19 years, 10 months ago) by avsm
Branch: MAIN
Changes since 1.206: +5 -5 lines
Diff to previous 1.206 (colored)

make ssh -Wshadow clean, no functional changes
markus@ ok

Revision 1.206 / (download) - annotate - [select for diffs], Fri Jun 18 11:11:54 2004 UTC (19 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.205: +2 -2 lines
Diff to previous 1.205 (colored)

clientloop.c

Revision 1.205 / (download) - annotate - [select for diffs], Mon Jun 14 01:44:38 2004 UTC (19 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.204: +3 -3 lines
Diff to previous 1.204 (colored)

set_nonblock() instead of fnctl(...,O_NONBLOCK); "looks sane" deraadt@

Revision 1.204 / (download) - annotate - [select for diffs], Sun Jun 13 15:03:02 2004 UTC (19 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.203: +68 -8 lines
Diff to previous 1.203 (colored)

implement session multiplexing in the client (the server has supported this
since 2.0); ok markus@

Revision 1.203 / (download) - annotate - [select for diffs], Wed May 26 23:02:39 2004 UTC (19 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.202: +2 -1 lines
Diff to previous 1.202 (colored)

missing freeaddrinfo; Andrey Matveev

Revision 1.202 / (download) - annotate - [select for diffs], Fri May 21 11:33:11 2004 UTC (20 years ago) by djm
Branch: MAIN
Changes since 1.201: +63 -4 lines
Diff to previous 1.201 (colored)

bz #756: add support for the cancel-tcpip-forward request for the server and
the client (through the ~C commandline). reported by z3p AT twistedmatrix.com;
ok markus@

Revision 1.201 / (download) - annotate - [select for diffs], Tue May 11 19:01:43 2004 UTC (20 years ago) by deraadt
Branch: MAIN
Changes since 1.200: +2 -2 lines
Diff to previous 1.200 (colored)

improve some code lint did not like; djm millert ok

Revision 1.187.2.3 / (download) - annotate - [select for diffs], Thu Mar 4 18:18:15 2004 UTC (20 years, 2 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.187.2.2: +21 -53 lines
Diff to previous 1.187.2.2 (colored) to branchpoint 1.187 (colored) next main 1.188 (colored)

upgrade to OpenSSH 3.8upgrade to OpenSSH 3.8upgrade to OpenSSH 3.8

Revision 1.195.2.1 / (download) - annotate - [select for diffs], Sat Feb 28 03:51:32 2004 UTC (20 years, 2 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.195: +21 -53 lines
Diff to previous 1.195 (colored)

upgrade to OpenSSH 3.8

Revision 1.200 / (download) - annotate - [select for diffs], Mon Jan 19 09:24:21 2004 UTC (20 years, 4 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE
Branch point for: OPENBSD_3_5
Changes since 1.199: +17 -5 lines
Diff to previous 1.199 (colored)

fake consumption for half closed channels since the peer is waiting for
window adjust messages; bugzilla #790 Matthew Dillon; test + ok dtucker@
reproduce with sh -c 'ulimit -f 10; ssh host -n od /bsd | cat > foo'

Revision 1.199 / (download) - annotate - [select for diffs], Tue Dec 2 17:01:14 2003 UTC (20 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.198: +3 -3 lines
Diff to previous 1.198 (colored)

use SSH_LISTEN_BACKLOG (=128) in listen(2).

Revision 1.198 / (download) - annotate - [select for diffs], Fri Nov 21 11:57:03 2003 UTC (20 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.197: +3 -3 lines
Diff to previous 1.197 (colored)

unexpand and delete whitespace at EOL; ok markus@

Revision 1.197 / (download) - annotate - [select for diffs], Tue Sep 23 20:41:11 2003 UTC (20 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.196: +1 -44 lines
Diff to previous 1.196 (colored)

move client only agent code to clientloop.c

Revision 1.196 / (download) - annotate - [select for diffs], Fri Sep 19 11:31:33 2003 UTC (20 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.195: +1 -2 lines
Diff to previous 1.195 (colored)

do not call channel_free_all on fatal; ok deraadt

Revision 1.187.2.2 / (download) - annotate - [select for diffs], Tue Sep 16 21:30:49 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.187.2.1: +4 -3 lines
Diff to previous 1.187.2.1 (colored) to branchpoint 1.187 (colored)

upgrade to OpenSSH 3.7.1

Revision 1.183.2.3 / (download) - annotate - [select for diffs], Tue Sep 16 21:25:56 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_2
Changes since 1.183.2.2: +4 -3 lines
Diff to previous 1.183.2.2 (colored) to branchpoint 1.183 (colored) next main 1.184 (colored)

upgrade to OpenSSH 3.7.1

Revision 1.183.2.2 / (download) - annotate - [select for diffs], Tue Sep 16 21:20:25 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_2
Changes since 1.183.2.1: +185 -73 lines
Diff to previous 1.183.2.1 (colored) to branchpoint 1.183 (colored)

upgrade to OpenSSH 3.7

Revision 1.195 / (download) - annotate - [select for diffs], Tue Sep 16 21:02:40 2003 UTC (20 years, 8 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE
Branch point for: OPENBSD_3_4
Changes since 1.194: +4 -3 lines
Diff to previous 1.194 (colored)

more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU

Revision 1.187.2.1 / (download) - annotate - [select for diffs], Tue Sep 16 20:50:42 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.187: +185 -73 lines
Diff to previous 1.187 (colored)

upgrade to OpenSSH 3.7

Revision 1.194 / (download) - annotate - [select for diffs], Fri Aug 29 10:04:36 2003 UTC (20 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.193: +31 -31 lines
Diff to previous 1.193 (colored)

be less chatty; debug -> debug2, cleanup; ok henning@

Revision 1.193 / (download) - annotate - [select for diffs], Wed Jul 2 14:51:16 2003 UTC (20 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.192: +117 -3 lines
Diff to previous 1.192 (colored)

(re)add socks5 suppport to -D; ok djm@
now ssh(1) can act both as a socks 4 and socks 5 server and
dynamically forward ports.

Revision 1.192 / (download) - annotate - [select for diffs], Wed Jul 2 12:56:34 2003 UTC (20 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.191: +7 -3 lines
Diff to previous 1.191 (colored)

deny dynamic forwarding with -R for v1, too; ok djm@

Revision 1.191 / (download) - annotate - [select for diffs], Tue Jun 24 08:23:46 2003 UTC (20 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.190: +2 -2 lines
Diff to previous 1.190 (colored)

int -> u_int; ok djm@, deraadt@, mouring@

Revision 1.190 / (download) - annotate - [select for diffs], Sun May 11 20:30:24 2003 UTC (21 years ago) by markus
Branch: MAIN
Changes since 1.189: +11 -18 lines
Diff to previous 1.189 (colored)

make channel_new() strdup the 'remote_name' (not the caller); ok theo

Revision 1.189 / (download) - annotate - [select for diffs], Mon Apr 14 14:17:50 2003 UTC (21 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.188: +6 -5 lines
Diff to previous 1.188 (colored)

avoid hardcoded SOCK_xx; with itojun@; should allow ssh over SCTP

Revision 1.188 / (download) - annotate - [select for diffs], Tue Apr 8 20:21:28 2003 UTC (21 years, 1 month ago) by itojun
Branch: MAIN
Changes since 1.187: +20 -20 lines
Diff to previous 1.187 (colored)

rename log() into logit() to avoid name conflict.  markus ok, from netbsd

Revision 1.172.2.5 / (download) - annotate - [select for diffs], Thu Apr 3 22:35:17 2003 UTC (21 years, 1 month ago) by miod
Branch: OPENBSD_3_1
Changes since 1.172.2.4: +14 -9 lines
Diff to previous 1.172.2.4 (colored) to branchpoint 1.172 (colored) next main 1.173 (colored)

Merge OpenSSH 3.6.1

Revision 1.183.2.1 / (download) - annotate - [select for diffs], Tue Apr 1 00:12:13 2003 UTC (21 years, 1 month ago) by margarida
Branch: OPENBSD_3_2
Changes since 1.183: +14 -9 lines
Diff to previous 1.183 (colored)

Update to OpenSSH 3.6

Revision 1.187 / (download) - annotate - [select for diffs], Wed Mar 5 22:33:43 2003 UTC (21 years, 2 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE
Branch point for: OPENBSD_3_3
Changes since 1.186: +3 -1 lines
Diff to previous 1.186 (colored)

fix memory leaks; from dlheine@suif.Stanford.EDU/CLOUSEAU; ok djm@

Revision 1.186 / (download) - annotate - [select for diffs], Fri Jan 10 10:32:54 2003 UTC (21 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.185: +5 -2 lines
Diff to previous 1.185 (colored)

hush socket() errors, except last. Fixes mindrot bug #408; ok markus@

Revision 1.185 / (download) - annotate - [select for diffs], Wed Jan 1 18:08:52 2003 UTC (21 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.184: +3 -3 lines
Diff to previous 1.184 (colored)

move big output buffer messages to debug2

Revision 1.184 / (download) - annotate - [select for diffs], Fri Dec 13 10:03:15 2002 UTC (21 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.183: +6 -6 lines
Diff to previous 1.183 (colored)

cleanup debug messages, more useful information for the client user.

Revision 1.140.2.5 / (download) - annotate - [select for diffs], Fri Oct 11 14:53:06 2002 UTC (21 years, 7 months ago) by miod
Branch: OPENBSD_3_0
Changes since 1.140.2.4: +23 -9 lines
Diff to previous 1.140.2.4 (colored) to branchpoint 1.140 (colored) next main 1.141 (colored)

Update to OpenSSH 3.5

Revision 1.172.2.4 / (download) - annotate - [select for diffs], Fri Oct 11 14:51:52 2002 UTC (21 years, 7 months ago) by miod
Branch: OPENBSD_3_1
Changes since 1.172.2.3: +23 -9 lines
Diff to previous 1.172.2.3 (colored) to branchpoint 1.172 (colored)

Update to OpenSSH 3.5

Revision 1.183 / (download) - annotate - [select for diffs], Tue Sep 17 07:47:02 2002 UTC (21 years, 8 months ago) by itojun
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE
Branch point for: OPENBSD_3_2
Changes since 1.182: +5 -1 lines
Diff to previous 1.182 (colored)

don't quit while creating X11 listening socket.

http://mail-index.netbsd.org/current-users/2002/09/16/0005.html
got from portable.  markus ok

Revision 1.182 / (download) - annotate - [select for diffs], Fri Sep 13 19:23:09 2002 UTC (21 years, 8 months ago) by stevesk
Branch: MAIN
Changes since 1.181: +7 -8 lines
Diff to previous 1.181 (colored)

remove use of SO_LINGER, it should not be needed. error check
SO_REUSEADDR. fixup comments. ok markus@

Revision 1.181 / (download) - annotate - [select for diffs], Mon Sep 9 14:54:14 2002 UTC (21 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.180: +2 -2 lines
Diff to previous 1.180 (colored)

signed vs unsigned from -pedantic; ok henning@

Revision 1.180 / (download) - annotate - [select for diffs], Thu Jul 4 08:12:15 2002 UTC (21 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.179: +12 -1 lines
Diff to previous 1.179 (colored)

blah blah minor nothing as i read and re-read and re-read...

Revision 1.140.2.4 / (download) - annotate - [select for diffs], Wed Jun 26 18:22:34 2002 UTC (21 years, 10 months ago) by miod
Branch: OPENBSD_3_0
Changes since 1.140.2.3: +18 -14 lines
Diff to previous 1.140.2.3 (colored) to branchpoint 1.140 (colored)

There was an update to OpenSSH 3.4, and people rejoiced.

Revision 1.172.2.3 / (download) - annotate - [select for diffs], Wed Jun 26 15:30:37 2002 UTC (21 years, 10 months ago) by jason
Branch: OPENBSD_3_1
Changes since 1.172.2.2: +22 -121 lines
Diff to previous 1.172.2.2 (colored) to branchpoint 1.172 (colored)

Pull in OpenSSH-3.4

Revision 1.179 / (download) - annotate - [select for diffs], Wed Jun 26 08:55:02 2002 UTC (21 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.178: +4 -1 lines
Diff to previous 1.178 (colored)

limit # of channels to 10000

Revision 1.178 / (download) - annotate - [select for diffs], Mon Jun 24 14:33:27 2002 UTC (21 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.177: +9 -7 lines
Diff to previous 1.177 (colored)

move channel counter to u_int

Revision 1.177 / (download) - annotate - [select for diffs], Sun Jun 23 21:34:07 2002 UTC (21 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.176: +2 -3 lines
Diff to previous 1.176 (colored)

tcode is u_int

Revision 1.176 / (download) - annotate - [select for diffs], Sun Jun 23 21:06:41 2002 UTC (21 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.175: +6 -5 lines
Diff to previous 1.175 (colored)

display, screen, row, col, xpixel, ypixel are u_int; markus ok

Revision 1.140.2.3 / (download) - annotate - [select for diffs], Sat Jun 22 07:23:17 2002 UTC (21 years, 11 months ago) by miod
Branch: OPENBSD_3_0
Changes since 1.140.2.2: +5 -108 lines
Diff to previous 1.140.2.2 (colored) to branchpoint 1.140 (colored)

Update OpenSSH to version 3.3 (with local changes, configuration files still
living in /etc and privsep user being nobody).

Revision 1.175 / (download) - annotate - [select for diffs], Mon Jun 10 22:28:41 2002 UTC (21 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.174: +1 -105 lines
Diff to previous 1.174 (colored)

move creation of agent socket to session.c; no need for uidswapping
in channel.c.

Revision 1.174 / (download) - annotate - [select for diffs], Sun Jun 9 13:32:01 2002 UTC (21 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.173: +5 -5 lines
Diff to previous 1.173 (colored)

use tab not spaces (|unexpand)

Revision 1.109.2.6 / (download) - annotate - [select for diffs], Sun Jun 2 22:56:10 2002 UTC (21 years, 11 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.109.2.5: +24 -6 lines
Diff to previous 1.109.2.5 (colored) to branchpoint 1.109 (colored) next main 1.110 (colored)

Upgrade to OpenSSH 3.2.3.

Except for improbable compilation error fixes, this should be the last
commit made to the 2.9-STABLE branche. Have fun upgrading.

Revision 1.172.2.2 / (download) - annotate - [select for diffs], Sat May 18 04:50:37 2002 UTC (22 years ago) by jason
Branch: OPENBSD_3_1
Changes since 1.172.2.1: +0 -0 lines
Diff to previous 1.172.2.1 (colored) to branchpoint 1.172 (colored)

Update to OpenSSH-3.2.3

Revision 1.172.2.1 / (download) - annotate - [select for diffs], Sat May 18 04:12:10 2002 UTC (22 years ago) by jason
Branch: OPENBSD_3_1
Changes since 1.172: +2 -2 lines
Diff to previous 1.172 (colored)

Update to OpenSSH-3.2.2

Revision 1.140.2.2 / (download) - annotate - [select for diffs], Fri May 17 00:03:23 2002 UTC (22 years ago) by miod
Branch: OPENBSD_3_0
Changes since 1.140.2.1: +24 -6 lines
Diff to previous 1.140.2.1 (colored) to branchpoint 1.140 (colored)

Update OpenSSH to version 3.2.2.

Revision 1.173 / (download) - annotate - [select for diffs], Mon Apr 22 21:04:52 2002 UTC (22 years ago) by markus
Branch: MAIN
Changes since 1.172: +2 -2 lines
Diff to previous 1.172 (colored)

request reply (success/failure) for -R style fwd in protocol v2,
depends on ordered replies.
fixes http://bugzilla.mindrot.org/show_bug.cgi?id=215; ok provos@

Revision 1.172 / (download) - annotate - [select for diffs], Mon Mar 25 21:13:51 2002 UTC (22 years, 1 month ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE
Branch point for: OPENBSD_3_1
Changes since 1.171: +23 -5 lines
Diff to previous 1.171 (colored)

don't send stderr data after EOF, accept this from older known (broken)
sshd servers only, fixes http://bugzilla.mindrot.org/show_bug.cgi?id=179

Revision 1.109.2.5 / (download) - annotate - [select for diffs], Sat Mar 9 00:20:44 2002 UTC (22 years, 2 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.109.2.4: +181 -303 lines
Diff to previous 1.109.2.4 (colored) to branchpoint 1.109 (colored)

Merge OpenSSH 3.1, keeping /etc as configuration files directory.
(i.e. OpenSSH 3.1 + openbsd29_3.1.patch)

Revision 1.72.2.8 / (download) - annotate - [select for diffs], Fri Mar 8 17:04:42 2002 UTC (22 years, 2 months ago) by brad
Branch: OPENBSD_2_8
Changes since 1.72.2.7: +181 -303 lines
Diff to previous 1.72.2.7 (colored) to branchpoint 1.72 (colored) next main 1.73 (colored)

Merge OpenSSH 3.1.

Revision 1.140.2.1 / (download) - annotate - [select for diffs], Thu Mar 7 17:37:46 2002 UTC (22 years, 2 months ago) by jason
Branch: OPENBSD_3_0
Changes since 1.140: +181 -303 lines
Diff to previous 1.140 (colored)

Update to OpenSSH-3.1 on 3.0-stable branch

Revision 1.171 / (download) - annotate - [select for diffs], Mon Mar 4 19:37:58 2002 UTC (22 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.170: +2 -2 lines
Diff to previous 1.170 (colored)

off by one; thanks to joost@pine.nl

Revision 1.170 / (download) - annotate - [select for diffs], Wed Feb 27 21:23:13 2002 UTC (22 years, 2 months ago) by stevesk
Branch: MAIN
Changes since 1.169: +4 -5 lines
Diff to previous 1.169 (colored)

remove unneeded casts in [gs]etsockopt(); ok markus@

Revision 1.169 / (download) - annotate - [select for diffs], Sun Feb 24 19:59:42 2002 UTC (22 years, 2 months ago) by stevesk
Branch: MAIN
Changes since 1.168: +3 -1 lines
Diff to previous 1.168 (colored)

disable Nagle in connect_to() and channel_post_port_listener() (port
forwarding endpoints).  the intention is to preserve the on-the-wire
appearance to applications at either end; the applications can then
enable TCP_NODELAY according to their requirements. ok markus@

Revision 1.168 / (download) - annotate - [select for diffs], Thu Feb 14 23:27:59 2002 UTC (22 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.167: +3 -4 lines
Diff to previous 1.167 (colored)

increase the SSH v2 window size to 4 packets. comsumes a little
bit more memory for slow receivers but increases througput.

Revision 1.167 / (download) - annotate - [select for diffs], Wed Feb 6 14:55:15 2002 UTC (22 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.166: +7 -51 lines
Diff to previous 1.166 (colored)

channel_new never returns NULL, mouring@; ok djm@

Revision 1.166 / (download) - annotate - [select for diffs], Tue Feb 5 14:32:55 2002 UTC (22 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.165: +5 -11 lines
Diff to previous 1.165 (colored)

merge channel_request() into channel_request_start()

Revision 1.165 / (download) - annotate - [select for diffs], Sun Feb 3 17:58:21 2002 UTC (22 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.164: +7 -11 lines
Diff to previous 1.164 (colored)

generic callbacks are not really used, remove and
add a callback for msg of type SSH2_MSG_CHANNEL_OPEN_CONFIRMATION
ok djm@

Revision 1.164 / (download) - annotate - [select for diffs], Sun Feb 3 17:55:55 2002 UTC (22 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.163: +1 -26 lines
Diff to previous 1.163 (colored)

remove unused channel_input_channel_request

Revision 1.163 / (download) - annotate - [select for diffs], Sun Jan 27 14:57:46 2002 UTC (22 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.162: +3 -3 lines
Diff to previous 1.162 (colored)

add X11UseLocalhost; ok markus@

Revision 1.162 / (download) - annotate - [select for diffs], Thu Jan 24 21:09:25 2002 UTC (22 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.161: +5 -9 lines
Diff to previous 1.161 (colored)

add set_nodelay() to set TCP_NODELAY on a socket (prep for nagle tuning).
no nagle changes just yet; ok djm@ markus@

Revision 1.161 / (download) - annotate - [select for diffs], Mon Jan 21 23:27:10 2002 UTC (22 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.160: +3 -1 lines
Diff to previous 1.160 (colored)

cleanup channels faster if the are empty and we are in drain-state; ok deraadt@

Revision 1.160 / (download) - annotate - [select for diffs], Wed Jan 16 13:17:51 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.159: +33 -38 lines
Diff to previous 1.159 (colored)

wrapper for channel_setup_fwd_listener

Revision 1.159 / (download) - annotate - [select for diffs], Mon Jan 14 13:55:55 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.158: +4 -3 lines
Diff to previous 1.158 (colored)

remove function pointers for events, remove chan_init*; ok provos@

Revision 1.158 / (download) - annotate - [select for diffs], Wed Jan 9 17:26:35 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.157: +5 -5 lines
Diff to previous 1.157 (colored)

replace buffer_consume(b, buffer_len(b)) with buffer_clear(b); ok provos@

Revision 1.157 / (download) - annotate - [select for diffs], Wed Jan 9 17:16:00 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.156: +17 -43 lines
Diff to previous 1.156 (colored)

merge channel_pre_open_15/channel_pre_open_20; ok provos@

Revision 1.156 / (download) - annotate - [select for diffs], Sat Jan 5 10:43:40 2002 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.155: +13 -5 lines
Diff to previous 1.155 (colored)

fix hanging x11 channels for rejected cookies (e.g. XAUTHORITY=/dev/null xbiff)
bug #36, based on patch from djast@cs.toronto.edu

Revision 1.155 / (download) - annotate - [select for diffs], Sat Dec 29 21:56:01 2001 UTC (22 years, 4 months ago) by stevesk
Branch: MAIN
Changes since 1.154: +2 -2 lines
Diff to previous 1.154 (colored)

remove unneeded casts and some char->u_char cleanup; ok markus@

Revision 1.154 / (download) - annotate - [select for diffs], Fri Dec 28 15:06:00 2001 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.153: +16 -16 lines
Diff to previous 1.153 (colored)

remove plen from the dispatch fn. it's no longer used.

Revision 1.153 / (download) - annotate - [select for diffs], Fri Dec 28 14:50:54 2001 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.152: +3 -3 lines
Diff to previous 1.152 (colored)

packet_read* no longer return the packet length, since it's not used.

Revision 1.152 / (download) - annotate - [select for diffs], Fri Dec 28 12:14:27 2001 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.151: +13 -13 lines
Diff to previous 1.151 (colored)

s/packet_done/packet_check_eom/ (end-of-message); ok djm@

Revision 1.151 / (download) - annotate - [select for diffs], Thu Dec 27 20:39:58 2001 UTC (22 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.150: +9 -19 lines
Diff to previous 1.150 (colored)

get rid of packet_integrity_check, use packet_done() instead.

Revision 1.150 / (download) - annotate - [select for diffs], Thu Dec 20 22:50:24 2001 UTC (22 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.149: +15 -15 lines
Diff to previous 1.149 (colored)

Conformance fix: we should send failing packet sequence number when
responding with a SSH_MSG_UNIMPLEMENTED message. Spotted by
yakk@yakk.dot.net; ok markus@

Revision 1.149 / (download) - annotate - [select for diffs], Thu Dec 20 16:37:29 2001 UTC (22 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.148: +15 -5 lines
Diff to previous 1.148 (colored)

setup x11 listen socket for just one connect if the client requests so.
(v2 only, but the openssh client does not support this feature).

Revision 1.148 / (download) - annotate - [select for diffs], Wed Dec 19 07:18:56 2001 UTC (22 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.147: +10 -10 lines
Diff to previous 1.147 (colored)

basic KNF done while i was looking for something else

Revision 1.147 / (download) - annotate - [select for diffs], Sat Dec 8 17:49:28 2001 UTC (22 years, 5 months ago) by stevesk
Branch: MAIN
Changes since 1.146: +11 -23 lines
Diff to previous 1.146 (colored)

use only one path to X11 UNIX domain socket vs. an array of paths
to try.  report from djast@cs.toronto.edu.  ok markus@

Revision 1.146 / (download) - annotate - [select for diffs], Thu Dec 6 18:20:32 2001 UTC (22 years, 5 months ago) by stevesk
Branch: MAIN
Changes since 1.145: +9 -3 lines
Diff to previous 1.145 (colored)

disable nagle for X11 fake server and client TCPs.  from netbsd.
ok markus@

Revision 1.145 / (download) - annotate - [select for diffs], Thu Dec 6 18:09:23 2001 UTC (22 years, 5 months ago) by stevesk
Branch: MAIN
Changes since 1.144: +3 -5 lines
Diff to previous 1.144 (colored)

strncpy->strlcpy.  remaining strncpy's are necessary.  ok markus@

Revision 1.144 / (download) - annotate - [select for diffs], Thu Dec 6 18:02:32 2001 UTC (22 years, 5 months ago) by stevesk
Branch: MAIN
Changes since 1.143: +1 -4 lines
Diff to previous 1.143 (colored)

shutdown(sock, SHUT_RDWR) not needed here; ok markus@

Revision 1.143 / (download) - annotate - [select for diffs], Wed Dec 5 10:06:12 2001 UTC (22 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.142: +5 -5 lines
Diff to previous 1.142 (colored)

minor KNF

Revision 1.142 / (download) - annotate - [select for diffs], Wed Dec 5 03:56:39 2001 UTC (22 years, 5 months ago) by itojun
Branch: MAIN
Changes since 1.141: +10 -10 lines
Diff to previous 1.141 (colored)

make it compile with more strict prototype checking

Revision 1.141 / (download) - annotate - [select for diffs], Thu Nov 29 21:10:51 2001 UTC (22 years, 5 months ago) by stevesk
Branch: MAIN
Changes since 1.140: +12 -20 lines
Diff to previous 1.140 (colored)

sshd X11 fake server will now listen on localhost by default:
$ echo $DISPLAY
localhost:12.0
$ netstat -an|grep 6012
tcp        0      0  127.0.0.1.6012         *.*                    LISTEN
tcp6       0      0  ::1.6012               *.*                    LISTEN
sshd_config gatewayports=yes can be used to revert back to the old
behavior.  will control this with another option later.  ok markus@

Revision 1.109.2.4 / (download) - annotate - [select for diffs], Thu Nov 15 00:15:19 2001 UTC (22 years, 6 months ago) by miod
Branch: OPENBSD_2_9
Changes since 1.109.2.3: +66 -51 lines
Diff to previous 1.109.2.3 (colored) to branchpoint 1.109 (colored)

Merge OpenSSH 3.0

Revision 1.72.2.7 / (download) - annotate - [select for diffs], Thu Nov 15 00:14:59 2001 UTC (22 years, 6 months ago) by miod
Branch: OPENBSD_2_8
Changes since 1.72.2.6: +66 -51 lines
Diff to previous 1.72.2.6 (colored) to branchpoint 1.72 (colored)

Merge OpenSSH 3.0

Revision 1.140 / (download) - annotate - [select for diffs], Wed Oct 10 22:18:47 2001 UTC (22 years, 7 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE
Branch point for: OPENBSD_3_0
Changes since 1.139: +25 -24 lines
Diff to previous 1.139 (colored)

try to keep channels open until an exit-status message is sent.
don't kill the login shells if the shells stdin/out/err is closed.
this should now work:
ssh -2n localhost 'exec > /dev/null 2>&1; sleep 10; exit 5'; echo ?

Revision 1.139 / (download) - annotate - [select for diffs], Tue Oct 9 21:59:41 2001 UTC (22 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.138: +1 -17 lines
Diff to previous 1.138 (colored)

simplify session close: no more delayed session_close, no more blocking wait() calls.

Revision 1.138 / (download) - annotate - [select for diffs], Mon Oct 8 11:48:57 2001 UTC (22 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.137: +2 -2 lines
Diff to previous 1.137 (colored)

better debug

Revision 1.137 / (download) - annotate - [select for diffs], Sun Oct 7 17:49:40 2001 UTC (22 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.136: +28 -8 lines
Diff to previous 1.136 (colored)

avoid possible FD_ISSET overflow for channels established
during channnel_after_select() (used for dynamic channels).

Revision 1.136 / (download) - annotate - [select for diffs], Thu Oct 4 15:05:40 2001 UTC (22 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.135: +8 -4 lines
Diff to previous 1.135 (colored)

comment out bogus conditions for selecting on connection_in

Revision 1.135 / (download) - annotate - [select for diffs], Mon Oct 1 21:38:53 2001 UTC (22 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.134: +8 -2 lines
Diff to previous 1.134 (colored)

remove ugliness; vp@drexel.edu via angelos

Revision 1.109.2.3 / (download) - annotate - [select for diffs], Thu Sep 27 19:03:54 2001 UTC (22 years, 7 months ago) by jason
Branch: OPENBSD_2_9
Changes since 1.109.2.2: +793 -649 lines
Diff to previous 1.109.2.2 (colored) to branchpoint 1.109 (colored)

Pull in OpenSSH-2.9.9

Revision 1.72.2.6 / (download) - annotate - [select for diffs], Thu Sep 27 00:15:41 2001 UTC (22 years, 7 months ago) by miod
Branch: OPENBSD_2_8
Changes since 1.72.2.5: +796 -651 lines
Diff to previous 1.72.2.5 (colored) to branchpoint 1.72 (colored)

Pull in OpenSSH 2.9.9 to the 2.8 branch.

Revision 1.134 / (download) - annotate - [select for diffs], Mon Sep 17 21:04:01 2001 UTC (22 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.133: +7 -4 lines
Diff to previous 1.133 (colored)

don't send fake dummy packets on CR (\r)
bugreport from yyua@cs.sfu.ca via solar@@openwall.com

Revision 1.133 / (download) - annotate - [select for diffs], Mon Sep 17 20:52:47 2001 UTC (22 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.132: +14 -1 lines
Diff to previous 1.132 (colored)

try to fix agent-forwarding-backconnection-bug, as seen on HPUX, for example;
with Lutz.Jaenicke@aet.TU-Cottbus.DE,

Revision 1.132 / (download) - annotate - [select for diffs], Tue Jul 17 21:04:56 2001 UTC (22 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.131: +47 -32 lines
Diff to previous 1.131 (colored)

keep track of both maxfd and the size of the malloc'ed fdsets.
update maxfd if maxfd gets closed.

Revision 1.131 / (download) - annotate - [select for diffs], Mon Jul 2 22:52:56 2001 UTC (22 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.130: +49 -7 lines
Diff to previous 1.130 (colored)

improve cleanup/exit logic in ssh2:
stop listening to channels, detach channel users (e.g. sessions).
wait for children (i.e. dying sessions), send exit messages,
cleanup all channels.

Revision 1.130 / (download) - annotate - [select for diffs], Sat Jun 30 18:08:39 2001 UTC (22 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.129: +2 -2 lines
Diff to previous 1.129 (colored)

adress -> address; ok markus@

Revision 1.129 / (download) - annotate - [select for diffs], Fri Jun 29 18:40:28 2001 UTC (22 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.128: +2 -2 lines
Diff to previous 1.128 (colored)

use socklen_t for getsockopt arg #5; ok markus@

Revision 1.128 / (download) - annotate - [select for diffs], Mon Jun 25 08:25:35 2001 UTC (22 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.127: +2 -3 lines
Diff to previous 1.127 (colored)

update copyright for 2001

Revision 1.127 / (download) - annotate - [select for diffs], Sat Jun 23 15:12:17 2001 UTC (22 years, 10 months ago) by itojun
Branch: MAIN
Changes since 1.126: +36 -38 lines
Diff to previous 1.126 (colored)

more strict prototypes.  raise warning level in Makefile.inc.  markus ok'ed
TODO; cleanup headers

Revision 1.109.2.2 / (download) - annotate - [select for diffs], Thu Jun 21 23:45:23 2001 UTC (22 years, 11 months ago) by jason
Branch: OPENBSD_2_9
Changes since 1.109.2.1: +4 -3 lines
Diff to previous 1.109.2.1 (colored) to branchpoint 1.109 (colored)

Pull patch from current:
Fix (markus):
Unbreak -R forwarding for protocol 2

Revision 1.126 / (download) - annotate - [select for diffs], Wed Jun 20 13:56:39 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.125: +6 -34 lines
Diff to previous 1.125 (colored)

move from channel_stop_listening to channel_free_all,
call channel_free_all before calling waitpid() in serverloop.
fixes the utmp handling; report from Lutz.Jaenicke@aet.TU-Cottbus.DE

Revision 1.72.2.5 / (download) - annotate - [select for diffs], Tue Jun 12 22:47:33 2001 UTC (22 years, 11 months ago) by miod
Branch: OPENBSD_2_8
Changes since 1.72.2.4: +14 -9 lines
Diff to previous 1.72.2.4 (colored) to branchpoint 1.72 (colored)

Pull in patch from current:
Errata:
sshd(8) allows users to delete arbitrary files named "cookies" if
X11 forwarding is enabled. X11 forwarding is disabled by default.
Fix (markus):
- use fatal_register_cleanup instead of atexit, sync with x11 authdir
  handling
- switch uid when cleaning up tmp files and sockets; reported by
  zen-parse@gmx.net on bugtraq

Revision 1.109.2.1 / (download) - annotate - [select for diffs], Tue Jun 12 22:31:48 2001 UTC (22 years, 11 months ago) by jason
Branch: OPENBSD_2_9
Changes since 1.109: +14 -9 lines
Diff to previous 1.109 (colored)

Pull in patch from current:
Fix (markus):
- use fatal_register_cleanup instead of atexit, sync with x11 authdir handling
- switch uid when cleaning up tmp files and sockets; reported by zen-parse@gmx.net on bugtraq

Revision 1.125 / (download) - annotate - [select for diffs], Thu Jun 7 20:23:04 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.124: +2 -2 lines
Diff to previous 1.124 (colored)

use xxx_put_cstring()

Revision 1.124 / (download) - annotate - [select for diffs], Tue Jun 5 10:24:32 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.123: +3 -2 lines
Diff to previous 1.123 (colored)

don't delete the auth socket in channel_stop_listening()
auth_sock_cleanup_proc() will take care of this.

Revision 1.123 / (download) - annotate - [select for diffs], Mon Jun 4 21:59:42 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.122: +8 -4 lines
Diff to previous 1.122 (colored)

switch uid when cleaning up tmp files and sockets; reported by zen-parse@gmx.net on bugtraq

Revision 1.122 / (download) - annotate - [select for diffs], Sun Jun 3 14:55:38 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.121: +11 -9 lines
Diff to previous 1.121 (colored)

use fatal_register_cleanup instead of atexit, sync with x11 authdir handling

Revision 1.121 / (download) - annotate - [select for diffs], Thu May 31 10:30:14 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.120: +522 -508 lines
Diff to previous 1.120 (colored)

undo the .c file split, just merge the header and keep the cvs history

Revision 1.120, Wed May 30 12:55:09 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.119: +1 -1 lines
FILE REMOVED

channel layer cleanup: merge header files and split .c files

Revision 1.119 / (download) - annotate - [select for diffs], Mon May 28 23:25:24 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.118: +3 -4 lines
Diff to previous 1.118 (colored)

cleanup, typo

Revision 1.118 / (download) - annotate - [select for diffs], Mon May 28 23:14:49 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.117: +20 -8 lines
Diff to previous 1.117 (colored)

undo broken channel fix and try a different one. there
should be still some select errors...

Revision 1.117 / (download) - annotate - [select for diffs], Sat May 19 19:57:09 2001 UTC (23 years ago) by stevesk
Branch: MAIN
Changes since 1.116: +2 -2 lines
Diff to previous 1.116 (colored)

typo in error message

Revision 1.116 / (download) - annotate - [select for diffs], Wed May 16 22:09:20 2001 UTC (23 years ago) by markus
Branch: MAIN
Changes since 1.115: +4 -3 lines
Diff to previous 1.115 (colored)

more select() error fixes (don't set rfd/wfd to -1).

Revision 1.115 / (download) - annotate - [select for diffs], Wed May 9 22:51:57 2001 UTC (23 years ago) by markus
Branch: MAIN
Changes since 1.114: +4 -3 lines
Diff to previous 1.114 (colored)

fix -R for protocol 2, noticed by greg@nest.cx.
bug was introduced with experimental dynamic forwarding.

Revision 1.114 / (download) - annotate - [select for diffs], Tue May 8 19:17:30 2001 UTC (23 years ago) by markus
Branch: MAIN
Changes since 1.113: +58 -22 lines
Diff to previous 1.113 (colored)

adds correct error reporting to async connect()s
fixes the server-discards-data-before-connected-bug found by onoe@sm.sony.co.jp

Revision 1.72.2.4 / (download) - annotate - [select for diffs], Mon May 7 21:09:27 2001 UTC (23 years ago) by jason
Branch: OPENBSD_2_8
Changes since 1.72.2.3: +252 -58 lines
Diff to previous 1.72.2.3 (colored) to branchpoint 1.72 (colored)

Pull in OpenSSH-2.9 to 2.8 branch.

Revision 1.113 / (download) - annotate - [select for diffs], Fri May 4 23:47:33 2001 UTC (23 years ago) by markus
Branch: MAIN
Changes since 1.112: +193 -162 lines
Diff to previous 1.112 (colored)

move to Channel **channels (instead of Channel *channels), fixes realloc problems.
channel_new now returns a Channel *, favour Channel * over channel id.
remove old channel_allocate interface.

Revision 1.112 / (download) - annotate - [select for diffs], Fri May 4 14:34:34 2001 UTC (23 years ago) by markus
Branch: MAIN
Changes since 1.111: +11 -4 lines
Diff to previous 1.111 (colored)

channel_new() reallocs channels[], we cannot use Channel *c after calling
channel_new(), XXX fix this in the future...

Revision 1.111 / (download) - annotate - [select for diffs], Thu May 3 15:07:39 2001 UTC (23 years ago) by stevesk
Branch: MAIN
Changes since 1.110: +2 -2 lines
Diff to previous 1.110 (colored)

typo in debug() string

Revision 1.110 / (download) - annotate - [select for diffs], Sun Apr 29 19:16:52 2001 UTC (23 years ago) by markus
Branch: MAIN
Changes since 1.109: +2 -2 lines
Diff to previous 1.109 (colored)

more ssh.com-2.0.x bug-compat; from per@appgate.com

Revision 1.109 / (download) - annotate - [select for diffs], Tue Apr 17 12:55:03 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE
Branch point for: OPENBSD_2_9
Changes since 1.108: +23 -188 lines
Diff to previous 1.108 (colored)

undo socks5 and https support since they are not really used and
only bloat ssh.  remove -D from usage(), since '-D' is experimental.

Revision 1.108 / (download) - annotate - [select for diffs], Sat Apr 14 16:17:14 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.107: +5 -5 lines
Diff to previous 1.107 (colored)

remove some channels that are not appropriate for keepalive.

Revision 1.107 / (download) - annotate - [select for diffs], Fri Apr 13 22:46:52 2001 UTC (23 years, 1 month ago) by beck
Branch: MAIN
Changes since 1.106: +36 -1 lines
Diff to previous 1.106 (colored)

Add options ClientAliveInterval and ClientAliveCountMax to sshd.
This gives the ability to do a "keepalive" via the encrypted channel
which can't be spoofed (unlike TCP keepalives). Useful for when you want
to use ssh connections to authenticate people for something, and know
relatively quickly when they are no longer authenticated. Disabled
by default (of course). ok markus@

Revision 1.106 / (download) - annotate - [select for diffs], Wed Apr 11 13:56:13 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.105: +149 -11 lines
Diff to previous 1.105 (colored)

https-connect and socks5 support. i feel so bad.

Revision 1.105 / (download) - annotate - [select for diffs], Tue Apr 10 12:15:23 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.104: +6 -6 lines
Diff to previous 1.104 (colored)

debug cleanup

Revision 1.104 / (download) - annotate - [select for diffs], Tue Apr 10 07:46:58 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.103: +117 -69 lines
Diff to previous 1.103 (colored)

cleanup socks4 handling

Revision 1.103 / (download) - annotate - [select for diffs], Sat Apr 7 08:55:17 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.102: +182 -46 lines
Diff to previous 1.102 (colored)

allow the ssh client act as a SOCKS4 proxy (dynamic local portforwarding).
work by Dan Kaminsky <dankamin@cisco.com> and me. thanks to Dan for this
great patch: use 'ssh -D 1080 host' and make netscape use localhost:1080 as
a socks proxy.

Revision 1.102 / (download) - annotate - [select for diffs], Fri Apr 6 21:00:10 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.101: +2 -2 lines
Diff to previous 1.101 (colored)

do gid/groups-swap in addition to uid-swap, should help if /home/group
is chmod 750 + chgrp grp /home/group/, work be deraadt and me, thanks
to olar@openwall.com is comments.  we had many requests for this.

Revision 1.101 / (download) - annotate - [select for diffs], Thu Apr 5 10:42:48 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.100: +3 -3 lines
Diff to previous 1.100 (colored)

fix whitespace: unexpand + trailing spaces.

Revision 1.100 / (download) - annotate - [select for diffs], Wed Apr 4 20:25:35 2001 UTC (23 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.99: +5 -3 lines
Diff to previous 1.99 (colored)

more robust rekeying
don't send channel data after rekeying is started.

Revision 1.72.2.3 / (download) - annotate - [select for diffs], Wed Mar 21 19:46:23 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.72.2.2: +132 -82 lines
Diff to previous 1.72.2.2 (colored) to branchpoint 1.72 (colored)

Pull in OpenSSH-2.5.2 for 2.8 branch.

Revision 1.57.2.5 / (download) - annotate - [select for diffs], Wed Mar 21 18:52:38 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.57.2.4: +132 -82 lines
Diff to previous 1.57.2.4 (colored) to branchpoint 1.57 (colored) next main 1.58 (colored)

Pull in OpenSSH-2.5.2 for 2.7 branch.

Revision 1.99 / (download) - annotate - [select for diffs], Fri Mar 16 19:06:29 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.98: +79 -60 lines
Diff to previous 1.98 (colored)

implement "permitopen" key option, restricts -L style forwarding to
to specified host:port pairs. based on work by harlan@genua.de

Revision 1.57.2.4 / (download) - annotate - [select for diffs], Mon Mar 12 15:44:08 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.57.2.3: +289 -111 lines
Diff to previous 1.57.2.3 (colored) to branchpoint 1.57 (colored)

OpenSSH-2.5.1 for 2.7 patch branch

Revision 1.98 / (download) - annotate - [select for diffs], Sun Mar 4 17:42:28 2001 UTC (23 years, 2 months ago) by millert
Branch: MAIN
Changes since 1.97: +2 -2 lines
Diff to previous 1.97 (colored)

log functions should not be passed strings that end in newline as they
get passed on to syslog() and when logging to stderr, do_log() appends
its own newline.

Revision 1.97 / (download) - annotate - [select for diffs], Sun Mar 4 00:03:59 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.96: +2 -2 lines
Diff to previous 1.96 (colored)

debug1->2

Revision 1.96 / (download) - annotate - [select for diffs], Wed Feb 28 21:31:32 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.95: +2 -2 lines
Diff to previous 1.95 (colored)

typo

Revision 1.95 / (download) - annotate - [select for diffs], Wed Feb 28 21:27:48 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.94: +6 -6 lines
Diff to previous 1.94 (colored)

use ignore message to simulate a SSH2_MSG_CHANNEL_DATA message
use random content in ignore messages.

Revision 1.94 / (download) - annotate - [select for diffs], Wed Feb 28 12:55:07 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.93: +5 -5 lines
Diff to previous 1.93 (colored)

unify debug messages

Revision 1.93 / (download) - annotate - [select for diffs], Wed Feb 28 08:54:55 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.92: +44 -13 lines
Diff to previous 1.92 (colored)

make sure remote stderr does not get truncated.
remove closed fd's from the select mask.

Revision 1.72.2.2 / (download) - annotate - [select for diffs], Mon Feb 19 17:18:44 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.72.2.1: +0 -0 lines
Diff to previous 1.72.2.1 (colored) to branchpoint 1.72 (colored)

Pull in OpenSSH-2.5.1

Revision 1.72.2.1 / (download) - annotate - [select for diffs], Fri Feb 16 20:12:57 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.72: +289 -111 lines
Diff to previous 1.72 (colored)

Pull in OpenSSH 2.5.0

Revision 1.92 / (download) - annotate - [select for diffs], Fri Feb 16 13:38:18 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.91: +1 -2 lines
Diff to previous 1.91 (colored)

remove debug

Revision 1.91 / (download) - annotate - [select for diffs], Thu Feb 15 23:19:59 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.90: +28 -1 lines
Diff to previous 1.90 (colored)

genericize password padding function for SSH1 and SSH2.
add stylized echo to 2, too.

Revision 1.90 / (download) - annotate - [select for diffs], Thu Feb 8 21:58:28 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.89: +6 -4 lines
Diff to previous 1.89 (colored)

nuke sprintf, ok deraadt@

Revision 1.89 / (download) - annotate - [select for diffs], Sun Feb 4 15:32:23 2001 UTC (23 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.88: +6 -6 lines
Diff to previous 1.88 (colored)

unexpand and remove end-of-line whitespace; ok markus@

Revision 1.88 / (download) - annotate - [select for diffs], Thu Feb 1 21:58:08 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.87: +6 -6 lines
Diff to previous 1.87 (colored)

use ipaddr in channel messages, ietf-secsh wants this

Revision 1.87 / (download) - annotate - [select for diffs], Wed Jan 31 20:37:22 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.86: +13 -8 lines
Diff to previous 1.86 (colored)

do not disconnect if local port forwarding fails, e.g. if port is already in use

Revision 1.86 / (download) - annotate - [select for diffs], Wed Jan 31 19:26:19 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.85: +14 -8 lines
Diff to previous 1.85 (colored)

ssh.com-2.0.1x does not send additional info in CHANNEL_OPEN_FAILURE messages; bug report from edmundo@rano.org

Revision 1.85 / (download) - annotate - [select for diffs], Mon Jan 29 19:42:35 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.84: +7 -7 lines
Diff to previous 1.84 (colored)

add get_peer_ipaddr(socket), x11-fwd in ssh2 requires ipaddr, not DNS

Revision 1.84 / (download) - annotate - [select for diffs], Mon Jan 29 16:55:36 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.83: +27 -19 lines
Diff to previous 1.83 (colored)

fix select overflow; ok deraadt@ and stevesk@

Revision 1.83 / (download) - annotate - [select for diffs], Wed Jan 24 21:03:50 2001 UTC (23 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.82: +2 -1 lines
Diff to previous 1.82 (colored)

missing freeaddrinfo(); ok markus@

Revision 1.82 / (download) - annotate - [select for diffs], Sun Jan 21 19:05:46 2001 UTC (23 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.81: +12 -10 lines
Diff to previous 1.81 (colored)

split ssh.h and try to cleanup the #include mess. remove unnecessary #includes.
rename util.[ch] -> misc.[ch]

Revision 1.81 / (download) - annotate - [select for diffs], Fri Jan 19 15:55:10 2001 UTC (23 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.80: +2 -1 lines
Diff to previous 1.80 (colored)

move ssh1 definitions to ssh1.h, pathnames to pathnames.h

Revision 1.80 / (download) - annotate - [select for diffs], Mon Jan 8 22:03:23 2001 UTC (23 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.79: +2 -2 lines
Diff to previous 1.79 (colored)

O_NDELAY -> O_NONBLOCK; thanks stevesk@pobox.com

Revision 1.79 / (download) - annotate - [select for diffs], Fri Dec 29 22:19:13 2000 UTC (23 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.78: +6 -2 lines
Diff to previous 1.78 (colored)

missing xfree; from vaughan99@yahoo.com

Revision 1.78 / (download) - annotate - [select for diffs], Fri Dec 29 11:05:55 2000 UTC (23 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.77: +2 -2 lines
Diff to previous 1.77 (colored)

remove->unlink; stevesk@pobox.com

Revision 1.77 / (download) - annotate - [select for diffs], Tue Dec 19 23:17:56 2000 UTC (23 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.76: +16 -16 lines
Diff to previous 1.76 (colored)

replace 'unsigned bla' with 'u_bla' everywhere. also, replace 'char unsigned'
with u_char.

Revision 1.76 / (download) - annotate - [select for diffs], Tue Dec 19 22:43:44 2000 UTC (23 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.75: +2 -2 lines
Diff to previous 1.75 (colored)

remove() -> unlink() for consistency

Revision 1.75 / (download) - annotate - [select for diffs], Tue Dec 5 20:34:09 2000 UTC (23 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.74: +45 -3 lines
Diff to previous 1.74 (colored)

async connects for -R/-L; ok deraadt@

Revision 1.74 / (download) - annotate - [select for diffs], Thu Nov 30 22:54:31 2000 UTC (23 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.73: +3 -2 lines
Diff to previous 1.73 (colored)

debug -> warn if server tries to do -R style fwd w/o client requesting this; ok niels@

Revision 1.57.2.3 / (download) - annotate - [select for diffs], Wed Nov 8 21:30:32 2000 UTC (23 years, 6 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.57.2.2: +100 -56 lines
Diff to previous 1.57.2.2 (colored) to branchpoint 1.57 (colored)

openssh-2.3.0 (again) for 2.7 branch

Revision 1.73 / (download) - annotate - [select for diffs], Mon Nov 6 23:04:55 2000 UTC (23 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.72: +120 -40 lines
Diff to previous 1.72 (colored)

agent forwarding and -R for ssh2, based on work from jhuuskon@messi.uku.fi

Revision 1.72 / (download) - annotate - [select for diffs], Fri Oct 27 07:48:22 2000 UTC (23 years, 6 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE
Branch point for: OPENBSD_2_8
Changes since 1.71: +23 -1 lines
Diff to previous 1.71 (colored)

deny agent/x11 forwarding unless requested; thanks to jwl@pobox.com

Revision 1.71 / (download) - annotate - [select for diffs], Fri Oct 27 07:32:17 2000 UTC (23 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.70: +23 -18 lines
Diff to previous 1.70 (colored)

enable non-blocking IO on channels, and tty's (except for the client ttys).

Revision 1.70 / (download) - annotate - [select for diffs], Thu Sep 28 18:03:18 2000 UTC (23 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.69: +12 -12 lines
Diff to previous 1.69 (colored)

debug -> debug2 cleanup

Revision 1.69 / (download) - annotate - [select for diffs], Thu Sep 21 11:25:33 2000 UTC (23 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.68: +14 -14 lines
Diff to previous 1.68 (colored)

add context to dispatch_run

Revision 1.68 / (download) - annotate - [select for diffs], Thu Sep 7 20:40:29 2000 UTC (23 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.67: +2 -8 lines
Diff to previous 1.67 (colored)

cleanup window and packet sizes for ssh2 flow control; ok niels

Revision 1.67 / (download) - annotate - [select for diffs], Thu Sep 7 20:27:50 2000 UTC (23 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.66: +31 -8 lines
Diff to previous 1.66 (colored)

cleanup copyright notices on all files.  I have attempted to be accurate with
the details.  everything is now under Tatu's licence (which I copied from his
readme), and/or the core-sdi bsd-ish thing for deattack, or various openbsd
developers under a 2-term bsd licence.  We're not changing any rules, just
being accurate.

Revision 1.57.2.2 / (download) - annotate - [select for diffs], Fri Sep 1 18:23:18 2000 UTC (23 years, 8 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.57.2.1: +26 -5 lines
Diff to previous 1.57.2.1 (colored) to branchpoint 1.57 (colored)

Pull in the rest of openssh-2.2.0 to 2.7 branch (luvin' cvs...)

Revision 1.66 / (download) - annotate - [select for diffs], Sat Aug 19 21:55:51 2000 UTC (23 years, 9 months ago) by markus
Branch: MAIN
Changes since 1.65: +2 -2 lines
Diff to previous 1.65 (colored)

more ~ support for ssh2

Revision 1.65 / (download) - annotate - [select for diffs], Sat Aug 19 18:48:10 2000 UTC (23 years, 9 months ago) by markus
Branch: MAIN
Changes since 1.64: +20 -2 lines
Diff to previous 1.64 (colored)

support for ~. in ssh2

Revision 1.64 / (download) - annotate - [select for diffs], Sun Jul 16 08:27:21 2000 UTC (23 years, 10 months ago) by markus
Branch: MAIN
Changes since 1.63: +6 -2 lines
Diff to previous 1.63 (colored)

make ssh-add accept dsa keys (the agent does not)

Revision 1.63 / (download) - annotate - [select for diffs], Sun Jun 25 20:17:57 2000 UTC (23 years, 10 months ago) by provos
Branch: MAIN
Changes since 1.62: +2 -2 lines
Diff to previous 1.62 (colored)

correct check for bad channel ids; from Wei Dai <weidai@eskimo.com>

Revision 1.62 / (download) - annotate - [select for diffs], Tue Jun 20 01:39:39 2000 UTC (23 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.61: +1 -1 lines
Diff to previous 1.61 (colored)

OpenBSD tag

Revision 1.61 / (download) - annotate - [select for diffs], Sat Jun 17 16:01:33 2000 UTC (23 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.60: +1 -2 lines
Diff to previous 1.60 (colored)

a real nix

Revision 1.60 / (download) - annotate - [select for diffs], Sat Jun 17 15:58:46 2000 UTC (23 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.59: +2 -2 lines
Diff to previous 1.59 (colored)

everyone says "nix it"

Revision 1.57.2.1 / (download) - annotate - [select for diffs], Mon Jun 12 02:37:32 2000 UTC (23 years, 11 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.57: +14 -22 lines
Diff to previous 1.57 (colored)

lovin' CVS... update patch branch to OpenSSH-2.1.1

Revision 1.59 / (download) - annotate - [select for diffs], Tue May 30 17:23:36 2000 UTC (23 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.58: +14 -5 lines
Diff to previous 1.58 (colored)

don't panic if mkdtemp fails for authfwd; jkb@yahoo-inc.com via kris@FreeBSD.org

Revision 1.58 / (download) - annotate - [select for diffs], Wed May 17 08:20:15 2000 UTC (24 years ago) by markus
Branch: MAIN
Changes since 1.57: +1 -18 lines
Diff to previous 1.57 (colored)

enable nonblocking IO for sshd w/ proto 1, too; split out common code

Revision 1.57 / (download) - annotate - [select for diffs], Mon May 8 17:42:24 2000 UTC (24 years ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE
Branch point for: OPENBSD_2_7
Changes since 1.56: +10 -3 lines
Diff to previous 1.56 (colored)

bug compat w/ ssh-2.0.13 x11, split out bugs

Revision 1.56 / (download) - annotate - [select for diffs], Wed May 3 18:03:06 2000 UTC (24 years ago) by markus
Branch: MAIN
Changes since 1.55: +3 -4 lines
Diff to previous 1.55 (colored)

GatewayPorts for sshd, ok deraadt@

Revision 1.55 / (download) - annotate - [select for diffs], Tue May 2 19:33:12 2000 UTC (24 years ago) by markus
Branch: MAIN
Changes since 1.54: +26 -2 lines
Diff to previous 1.54 (colored)

set O_NONBLOCK

Revision 1.54 / (download) - annotate - [select for diffs], Mon May 1 20:21:40 2000 UTC (24 years ago) by markus
Branch: MAIN
Changes since 1.53: +3 -2 lines
Diff to previous 1.53 (colored)

unbreak, ok niels@

Revision 1.53 / (download) - annotate - [select for diffs], Mon May 1 19:11:35 2000 UTC (24 years ago) by markus
Branch: MAIN
Changes since 1.52: +6 -2 lines
Diff to previous 1.52 (colored)

EINTR

Revision 1.52 / (download) - annotate - [select for diffs], Mon May 1 18:31:27 2000 UTC (24 years ago) by markus
Branch: MAIN
Changes since 1.51: +57 -48 lines
Diff to previous 1.51 (colored)

init all fds, close all fds.

Revision 1.51 / (download) - annotate - [select for diffs], Fri Apr 28 08:10:20 2000 UTC (24 years ago) by markus
Branch: MAIN
Changes since 1.50: +126 -85 lines
Diff to previous 1.50 (colored)

support for x11-fwding, client+server

Revision 1.50 / (download) - annotate - [select for diffs], Sun Apr 16 16:40:43 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.49: +3 -3 lines
Diff to previous 1.49 (colored)

fix pr 1196, listen_port and port_to_connect interchanged

Revision 1.49 / (download) - annotate - [select for diffs], Fri Apr 14 10:30:30 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.48: +42 -42 lines
Diff to previous 1.48 (colored)

whitespace cleanup

Revision 1.48 / (download) - annotate - [select for diffs], Fri Apr 14 10:09:14 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.47: +11 -1 lines
Diff to previous 1.47 (colored)

check payload for (illegal) extra data

Revision 1.47 / (download) - annotate - [select for diffs], Mon Apr 10 15:19:43 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.46: +3 -1 lines
Diff to previous 1.46 (colored)

repair x11-fwd

Revision 1.46 / (download) - annotate - [select for diffs], Thu Apr 6 09:43:15 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.45: +4 -3 lines
Diff to previous 1.45 (colored)

no adjust after close

Revision 1.45 / (download) - annotate - [select for diffs], Tue Apr 4 06:18:01 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.44: +8 -2 lines
Diff to previous 1.44 (colored)

close efd on eof

Revision 1.44 / (download) - annotate - [select for diffs], Mon Apr 3 07:07:15 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.43: +424 -36 lines
Diff to previous 1.43 (colored)

channel layer support for ssh2

Revision 1.43 / (download) - annotate - [select for diffs], Tue Mar 28 20:39:05 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.42: +2 -2 lines
Diff to previous 1.42 (colored)

typo

Revision 1.42 / (download) - annotate - [select for diffs], Tue Mar 28 20:33:50 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.41: +6 -3 lines
Diff to previous 1.41 (colored)

missing close

Revision 1.41 / (download) - annotate - [select for diffs], Tue Mar 28 20:31:25 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.40: +675 -507 lines
Diff to previous 1.40 (colored)

replace big switch() with function tables (prepare for ssh2)

Revision 1.40 / (download) - annotate - [select for diffs], Mon Mar 27 17:41:50 2000 UTC (24 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.39: +2 -2 lines
Diff to previous 1.39 (colored)

allow bigger packets

Revision 1.39 / (download) - annotate - [select for diffs], Thu Mar 16 20:56:14 2000 UTC (24 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.38: +3 -3 lines
Diff to previous 1.38 (colored)

-pedantic: signed vs. unsigned, void*-arithm, etc

Revision 1.38 / (download) - annotate - [select for diffs], Mon Jan 24 20:37:29 2000 UTC (24 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.37: +2 -4 lines
Diff to previous 1.37 (colored)

do not connect() if request has been denied.

Revision 1.37 / (download) - annotate - [select for diffs], Mon Jan 10 10:12:52 2000 UTC (24 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.36: +35 -28 lines
Diff to previous 1.36 (colored)

discard data for channel if state != CHAN_OUTPUT_OPEN, fixes lockup

Revision 1.36 / (download) - annotate - [select for diffs], Tue Jan 4 07:52:03 2000 UTC (24 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.35: +2 -2 lines
Diff to previous 1.35 (colored)

listen on _all_ interfaces for X11-Fwd (hints.ai_flags = AI_PASSIVE)

Revision 1.35 / (download) - annotate - [select for diffs], Tue Jan 4 00:07:58 2000 UTC (24 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.34: +194 -135 lines
Diff to previous 1.34 (colored)

ipv6 support: mostly gethostbyname->getaddrinfo/getnameinfo, new features:
sshd allows multiple ListenAddress and Port options.  note that libwrap is
not IPv6-ready. (based on patches from <kick@kyoto.wide.ad.jp> and
fujiwara@rcac.tdi.co.jp)

Revision 1.34 / (download) - annotate - [select for diffs], Mon Dec 27 09:48:38 1999 UTC (24 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.33: +8 -9 lines
Diff to previous 1.33 (colored)

use packet_get_maxsize for channels. consistence.

Revision 1.33 / (download) - annotate - [select for diffs], Sun Dec 12 19:20:02 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.32: +10 -10 lines
Diff to previous 1.32 (colored)

type conflict for 'extern Type *options' in channels.c; dot@dotat.at

Revision 1.32 / (download) - annotate - [select for diffs], Mon Dec 6 12:07:21 1999 UTC (24 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.31: +4 -3 lines
Diff to previous 1.31 (colored)

display great hatred towards strcpy

Revision 1.31 / (download) - annotate - [select for diffs], Wed Dec 1 13:59:15 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.30: +11 -13 lines
Diff to previous 1.30 (colored)

ports are u_short

Revision 1.30 / (download) - annotate - [select for diffs], Thu Nov 25 09:10:33 1999 UTC (24 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

fix type

Revision 1.29 / (download) - annotate - [select for diffs], Wed Nov 24 20:07:25 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.28: +13 -7 lines
Diff to previous 1.28 (colored)

fix packet_integrity_check() for !have_hostname_in_open.
report from mrwizard@psu.edu via djm@ibs.com.au

Revision 1.28 / (download) - annotate - [select for diffs], Wed Nov 24 20:02:11 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.27: +12 -2 lines
Diff to previous 1.27 (colored)

set SO_REUSEADDR and SO_LINGER for forwarded ports.
chip@valinux.com via damien@ibs.com.au

Revision 1.27 / (download) - annotate - [select for diffs], Wed Nov 24 19:53:45 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.26: +216 -134 lines
Diff to previous 1.26 (colored)

KNF, final part 3

Revision 1.26 / (download) - annotate - [select for diffs], Wed Nov 24 00:26:01 1999 UTC (24 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.25: +16 -16 lines
Diff to previous 1.25 (colored)

much more KNF

Revision 1.25 / (download) - annotate - [select for diffs], Tue Nov 23 22:25:53 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.24: +1172 -1225 lines
Diff to previous 1.24 (colored)

KNF part 1

Revision 1.24 / (download) - annotate - [select for diffs], Mon Nov 22 21:02:38 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.23: +2 -2 lines
Diff to previous 1.23 (colored)

syslog changes:
* Unified Logmessage for all auth-types, for success and for failed
* Standard connections get only ONE line in the LOG when level==LOG:
  Auth-attempts are logged only, if authentication is:
        a) successfull or
        b) with passwd or
        c) we had more than AUTH_FAIL_LOG failues
* many log() became verbose()
* old behaviour with level=VERBOSE

Revision 1.23 / (download) - annotate - [select for diffs], Fri Nov 19 19:58:18 1999 UTC (24 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.22: +5 -5 lines
Diff to previous 1.22 (colored)

SSH_CMSG_MAX_PACKET_SIZE, some clients use this, some need this, niels@
[hope this time my ISP stays alive during commit]

Revision 1.22 / (download) - annotate - [select for diffs], Fri Nov 19 19:18:20 1999 UTC (24 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.21: +4 -4 lines
Diff to previous 1.21 (colored)

make this compile, bad markus

Revision 1.21 / (download) - annotate - [select for diffs], Fri Nov 19 16:32:01 1999 UTC (24 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.20: +5 -5 lines
Diff to previous 1.20 (colored)

SSH_CMSG_MAX_PACKET_SIZE, some clients use this, some need this, niels@

Revision 1.20 / (download) - annotate - [select for diffs], Thu Nov 11 23:36:52 1999 UTC (24 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.19: +2 -1 lines
Diff to previous 1.19 (colored)

make all access to options via 'extern Options options'
and 'extern ServerOptions options' respectively;
options are no longer passed as arguments:
 * make options handling more consistent
 * remove #include "readconf.h" from ssh.h
 * readconf.h is only included if necessary

Revision 1.19 / (download) - annotate - [select for diffs], Tue Nov 2 19:42:35 1999 UTC (24 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.18: +14 -4 lines
Diff to previous 1.18 (colored)

replace assert() with error, fatal or packet_disconnect

Revision 1.18 / (download) - annotate - [select for diffs], Thu Oct 28 21:26:09 1999 UTC (24 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.17: +1 -4 lines
Diff to previous 1.17 (colored)

remove broken x11 fix and document istate/ostate

Revision 1.17 / (download) - annotate - [select for diffs], Tue Oct 26 22:39:44 1999 UTC (24 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.16: +39 -40 lines
Diff to previous 1.16 (colored)

more usefull debug messages and simplify channel alloc code

Revision 1.16 / (download) - annotate - [select for diffs], Sun Oct 17 16:56:08 1999 UTC (24 years, 7 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.15: +20 -25 lines
Diff to previous 1.15 (colored)

re-implement the proto-1.5 channel close protocol, see nchan.ms.

Revision 1.15 / (download) - annotate - [select for diffs], Sat Oct 16 21:19:00 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.14: +5 -5 lines
Diff to previous 1.14 (colored)

snprintf

Revision 1.14 / (download) - annotate - [select for diffs], Sat Oct 16 20:47:13 1999 UTC (24 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.13: +109 -57 lines
Diff to previous 1.13 (colored)

support for SSH protocol 1.5 which is poorly documented, the RFC.troff lies.
interops (x11,agent,etc) with 1.2.27 and protocol 1.3

Revision 1.13 / (download) - annotate - [select for diffs], Thu Oct 14 18:17:42 1999 UTC (24 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.12: +31 -53 lines
Diff to previous 1.12 (colored)

fix old connect() race security-bug for ssh-agent and agent-forwarding
by removing the connect() junk, with the following restrictions:
1) change the version to "OpenSSH-1.1":
   agent-forwarding will work only between OpenSSH-1.1 client and
   OpenSSH-1.1 server
2) renamed the environment variable of OpenSSH-1.1 to
   "SSH_AUTH_SOCKET", since useing OpenSSH-1.0 ssh-add against the new
   ssh-agent does not work

Revision 1.12 / (download) - annotate - [select for diffs], Tue Oct 5 22:18:52 1999 UTC (24 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.11: +31 -24 lines
Diff to previous 1.11 (colored)

move auth-sockets to private dir
delete minfd residua

Revision 1.11 / (download) - annotate - [select for diffs], Mon Oct 4 20:45:01 1999 UTC (24 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.10: +34 -82 lines
Diff to previous 1.10 (colored)

nuke genminfd/AUTH_FD

Revision 1.10 / (download) - annotate - [select for diffs], Sun Oct 3 19:22:38 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.9: +4 -4 lines
Diff to previous 1.9 (colored)

use SHUT_* symbols

Revision 1.9 / (download) - annotate - [select for diffs], Thu Sep 30 08:34:24 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.8: +2 -2 lines
Diff to previous 1.8 (colored)

even smaller

Revision 1.8 / (download) - annotate - [select for diffs], Thu Sep 30 08:03:39 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.7: +2 -2 lines
Diff to previous 1.7 (colored)

IPPORT_RESERVED

Revision 1.7 / (download) - annotate - [select for diffs], Thu Sep 30 05:11:29 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.6: +1 -15 lines
Diff to previous 1.6 (colored)

do not bother with dinosaur pacification

Revision 1.6 / (download) - annotate - [select for diffs], Wed Sep 29 21:14:16 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.5: +4 -42 lines
Diff to previous 1.5 (colored)

numerous sprintf, strncpy, strcpy cleanups

Revision 1.5 / (download) - annotate - [select for diffs], Wed Sep 29 18:16:19 1999 UTC (24 years, 7 months ago) by dugsong
Branch: MAIN
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored)

update krb4/AFS support to ssh-1.2.27-afs-kerberos-pl1 level, clean up unused variables, update manpages

Revision 1.4 / (download) - annotate - [select for diffs], Wed Sep 29 00:10:16 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.3: +7 -3 lines
Diff to previous 1.3 (colored)

GatewayPorts and ssh -g; markus.friedl@informatik.uni-erlangen.de

Revision 1.3 / (download) - annotate - [select for diffs], Tue Sep 28 07:56:47 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.2: +4 -2 lines
Diff to previous 1.2 (colored)

X11DisplayOffset; aaron

Revision 1.2 / (download) - annotate - [select for diffs], Tue Sep 28 04:45:36 1999 UTC (24 years, 7 months ago) by provos
Branch: MAIN
Changes since 1.1: +7 -4 lines
Diff to previous 1.1 (colored)

convert all uses of gmp to SSL bignum
convert all used of rsa to SSL rsa functions
remove all use of randomstate to OpenBSD arc4random() and arc4_stir()
all this done at a long long night in Canada.

Revision 1.1 / (download) - annotate - [select for diffs], Sun Sep 26 20:53:34 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN

i bet a lot of people didn't know what ssh 1.2.16 had a nice license.
well, except for the patent issues.  someone in sweden (forget their
name at the moment) cleaned out most of the patented code, and now
this code removes rsa code.  when this is done, it will link against
libssl, but the work isn't completely done yet.  then we need to bring
this up to modern days, featurewise.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Diffs between
and

Preferred Diff type:
View only Branch:
Sort log by: