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

Request diff between arbitrary revisions

Default branch: MAIN

Revision 1.260 / (download) - annotate - [select for diffs], Wed Oct 11 05:42:08 2023 UTC (7 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, HEAD
Changes since 1.259: +10 -2 lines
Diff to previous 1.259 (colored)

in olde rcp/scp protocol mode, when rejecting a path from the server
as not matching the glob that the client sent, log (at debug level) the
received pathname as well as the list of possible expected paths expanded
from the glob. bz2966

Revision 1.259 / (download) - annotate - [select for diffs], Sun Sep 10 23:12:32 2023 UTC (8 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4
Changes since 1.258: +4 -4 lines
Diff to previous 1.258 (colored)

rename remote_glob() -> sftp_glob() to match other API

Revision 1.258 / (download) - annotate - [select for diffs], Fri Sep 8 05:56:13 2023 UTC (8 months, 1 week ago) by djm
Branch: MAIN
Changes since 1.257: +22 -22 lines
Diff to previous 1.257 (colored)

the sftp code was one of my first contributions to OpenSSH and it
shows - the function names are terrible.

Rename do_blah() to sftp_blah() to make them less so.

Completely mechanical except for sftp_stat() and sftp_lstat() which
change from returning a pointer to a static variable (error-prone) to
taking a pointer to a caller-provided receiver.

Revision 1.257 / (download) - annotate - [select for diffs], Fri Jul 14 05:31:44 2023 UTC (10 months ago) by djm
Branch: MAIN
Changes since 1.256: +7 -2 lines
Diff to previous 1.256 (colored)

add defence-in-depth checks for some unreachable integer overflows
reported by Yair Mizrahi @ JFrog; feedback/ok millert@

Revision 1.256 / (download) - annotate - [select for diffs], Fri Mar 31 05:56:36 2023 UTC (13 months, 2 weeks ago) by dtucker
Branch: MAIN
Changes since 1.255: +3 -3 lines
Diff to previous 1.255 (colored)

Explicitly ignore return from waitpid here too.

Revision 1.255 / (download) - annotate - [select for diffs], Fri Mar 31 04:45:08 2023 UTC (13 months, 2 weeks ago) by dtucker
Branch: MAIN
Changes since 1.254: +3 -3 lines
Diff to previous 1.254 (colored)

Explictly ignore return codes where we don't check them.  From Dmitry
Belyavskiy via github PR#238, ok djm@

Revision 1.254 / (download) - annotate - [select for diffs], Mon Mar 27 03:25:08 2023 UTC (13 months, 3 weeks ago) by djm
Branch: MAIN
Changes since 1.253: +7 -1 lines
Diff to previous 1.253 (colored)

scp: when copying local->remote, check that source file exists before
opening SFTP connection to the server. Based on GHPR#370
ok dtucker, markus

Revision 1.253 / (download) - annotate - [select for diffs], Fri Mar 3 03:12:24 2023 UTC (14 months, 2 weeks ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.252: +5 -3 lines
Diff to previous 1.252 (colored)

Check return values of dup2.  Spotted by Coverity, ok djm@

Revision 1.252 / (download) - annotate - [select for diffs], Tue Jan 10 23:22:15 2023 UTC (16 months ago) by millert
Branch: MAIN
Changes since 1.251: +25 -37 lines
Diff to previous 1.251 (colored)

Switch scp from using pipes to a socketpair for communication with
it's ssh sub-processes.  We no longer need to reserve two descriptors
to ensure that we don't end up using fd 0-2 unexpectedly, that is
handled by sanitise_stdfd() in main().
Based on an original diff from djm@.  OK deraadt@ djm@

Revision 1.251 / (download) - annotate - [select for diffs], Fri Dec 16 06:52:48 2022 UTC (17 months ago) by jmc
Branch: MAIN
Changes since 1.250: +3 -3 lines
Diff to previous 1.250 (colored)

add -X to usage();

Revision 1.250 / (download) - annotate - [select for diffs], Fri Dec 16 03:40:03 2022 UTC (17 months ago) by djm
Branch: MAIN
Changes since 1.249: +36 -4 lines
Diff to previous 1.249 (colored)

add a -X option to both scp(1) and sftp(1) to allow control over
some SFTP protocol knobs: the copy buffer length and the number of
inflight requests, both of which are used during upload/download.

Previously these could be controlled in sftp(1) using the -b/-R options.
This makes them available in both SFTP protocol clients using the same
option character sequence.

ok dtucker@

Revision 1.249 / (download) - annotate - [select for diffs], Mon Oct 24 21:51:55 2022 UTC (18 months, 3 weeks ago) by djm
Branch: MAIN
Changes since 1.248: +35 -4 lines
Diff to previous 1.248 (colored)

when scp(1) is using the SFTP protocol for transport (the default),
better match scp/rcp's handling of globs that don't match the globbed
characters but do match literally (e.g. trying to transfer "foo.[1]").

Previously scp(1) in SFTP mode would not match these pathnames but
legacy scp/rcp mode would.

Reported by Michael Yagliyan in bz3488; ok dtucker@

Revision 1.248 / (download) - annotate - [select for diffs], Fri May 13 06:31:50 2022 UTC (2 years ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2
Changes since 1.247: +5 -5 lines
Diff to previous 1.247 (colored)

arrange for scp, when in sftp mode, to not ftruncate(3) files early

previous behavious of unconditionally truncating the destination file
would cause "scp ~/foo localhost:" and "scp localhost:foo ~/" to
delete all the contents of their destination.

spotted by solene@ sthen@, also bz3431; ok dtucker@

Revision 1.247 / (download) - annotate - [select for diffs], Sun Mar 20 08:52:17 2022 UTC (2 years, 1 month ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.246: +2 -2 lines
Diff to previous 1.246 (colored)

don't leak argument list; bz3404, reported by Balu Gajjala
ok dtucker@

Revision 1.246 / (download) - annotate - [select for diffs], Wed Feb 23 19:01:00 2022 UTC (2 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.245: +2 -2 lines
Diff to previous 1.245 (colored)

and we go back to testing sftp-scp after the 8.9 release...

Revision 1.245 / (download) - annotate - [select for diffs], Thu Feb 10 04:12:38 2022 UTC (2 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.244: +2 -2 lines
Diff to previous 1.244 (colored)

revert for imminent OpenSSH release, which wil ship with scp in RCP mode.

> revision 1.106
> date: 2021/10/15 14:46:46;  author: deraadt;  state: Exp;  lines: +13 -9;  commitid: w5n9B2RE38tFfggl;
> openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
> protocol for copying.  Let's get back to testing the SFTP protocol.

This will be put back once the OpenSSH release is done.

Revision 1.244 / (download) - annotate - [select for diffs], Tue Feb 1 23:11:11 2022 UTC (2 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.243: +8 -9 lines
Diff to previous 1.243 (colored)

better match legacy scp behaviour: show un-expanded paths in error
messages. Spotted by and ok tb@

Revision 1.243 / (download) - annotate - [select for diffs], Mon Jan 17 21:39:51 2022 UTC (2 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.242: +40 -15 lines
Diff to previous 1.242 (colored)

when transferring multiple files in SFTP mode, create the destination
directory if it doesn't already exist to match olde-scp(1) behaviour.
noticed by deraadt@ ok markus@

Revision 1.242 / (download) - annotate - [select for diffs], Sat Jan 8 07:36:11 2022 UTC (2 years, 4 months ago) by djm
Branch: MAIN
Changes since 1.241: +10 -5 lines
Diff to previous 1.241 (colored)

fix some corner-case bugs in scp sftp-mode handling of ~-prefixed
paths; spotted by jsg; feedback jsg & deraadt, ok jsg & markus

Revision 1.241 / (download) - annotate - [select for diffs], Sun Oct 24 21:24:17 2021 UTC (2 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.240: +2 -2 lines
Diff to previous 1.240 (colored)

For open/openat, if the flags parameter does not contain O_CREAT, the
3rd (variadic) mode_t parameter is irrelevant.  Many developers in the past
have passed mode_t (0, 044, 0644, or such), which might lead future people
to copy this broken idiom, and perhaps even believe this parameter has some
meaning or implication or application. Delete them all.
This comes out of a conversation where tb@ noticed that a strange (but
intentional) pledge behaviour is to always knock-out high-bits from
mode_t on a number of system calls as a safety factor, and his bewilderment
that this appeared to be happening against valid modes (at least visually),
but no sorry, they are all irrelevant junk.  They could all be 0xdeafbeef.
ok millert

Revision 1.240 / (download) - annotate - [select for diffs], Fri Oct 15 14:46:46 2021 UTC (2 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.239: +2 -2 lines
Diff to previous 1.239 (colored)

openbsd 7.0 release shipped with the (hopefully last) scp that uses RCP
protocol for copying.  Let's get back to testing the SFTP protocol.

Revision 1.239 / (download) - annotate - [select for diffs], Mon Sep 20 06:53:56 2021 UTC (2 years, 7 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.238: +2 -2 lines
Diff to previous 1.238 (colored)

fix missing -s in SYNOPSYS and usage() as well as a capitalisation
mistake; spotted by jmc@

Revision 1.238 / (download) - annotate - [select for diffs], Mon Sep 20 01:55:42 2021 UTC (2 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.237: +2 -2 lines
Diff to previous 1.237 (colored)

Switch scp back to use the old protocol by default, ahead of release.
We'll wait a little longer for people to pick up sftp-server(8) that
supports the extension that scp needs for ~user paths to continue
working in SFTP protocol mode. Discussed with deraadt@

Revision 1.237 / (download) - annotate - [select for diffs], Sat Sep 18 02:03:25 2021 UTC (2 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.236: +3 -2 lines
Diff to previous 1.236 (colored)

better error message for ~user failures when the sftp-server
lacks the expand-path extension; ok deraadt@

Revision 1.236 / (download) - annotate - [select for diffs], Thu Sep 16 15:22:22 2021 UTC (2 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.235: +8 -9 lines
Diff to previous 1.235 (colored)

make some more scp-in-SFTP mode better match Unix idioms

suggested by deraadt@

Revision 1.235 / (download) - annotate - [select for diffs], Thu Sep 16 15:11:19 2021 UTC (2 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.234: +5 -7 lines
Diff to previous 1.234 (colored)

allow log_stderr==2 to prefix log messages with argv[0]

use this to make scp's SFTP mode error messages more scp-like

prompted by and ok deraadt@

Revision 1.234 / (download) - annotate - [select for diffs], Sat Sep 11 00:40:24 2021 UTC (2 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.233: +10 -6 lines
Diff to previous 1.233 (colored)

when using SFTP protocol, continue transferring files after a
transfer error occurs. This matches original scp/rcp behaviour.
ok dtucker@

Revision 1.233 / (download) - annotate - [select for diffs], Wed Sep 8 23:31:39 2021 UTC (2 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.232: +3 -3 lines
Diff to previous 1.232 (colored)

Use the SFTP protocol by default. The original scp/rcp protocol remains
available via the -O flag.

Note that ~user/ prefixed paths in SFTP mode require a protocol extension
that was first shipped in OpenSSH 8.7.

ok deraadt, after baking in snaps for a while without incident

Revision 1.232 / (download) - annotate - [select for diffs], Wed Aug 11 14:07:54 2021 UTC (2 years, 9 months ago) by naddy
Branch: MAIN
Changes since 1.231: +2 -2 lines
Diff to previous 1.231 (colored)

scp: tweak man page and error message for -3 by default

Now that the -3 option is enabled by default, flip the documentation
and error message logic from "requires -3" to "blocked by -R".

ok djm@

Revision 1.231 / (download) - annotate - [select for diffs], Wed Aug 11 14:05:19 2021 UTC (2 years, 9 months ago) by naddy
Branch: MAIN
Changes since 1.230: +13 -14 lines
Diff to previous 1.230 (colored)

scp: do not spawn ssh with two -s flags for remote-to-remote copies

Do not add another "-s" to the argument vector every time an SFTP
connection is initiated.  Instead, introduce a subsystem flag to
do_cmd() and add "-s" when the flag is set.

ok djm@

Revision 1.230 / (download) - annotate - [select for diffs], Tue Aug 10 03:33:34 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.229: +10 -13 lines
Diff to previous 1.229 (colored)

Prepare for a future where scp(1) uses the SFTP protocol by default.
Replace recently added -M option to select the protocol with -O (olde)
and -s (SFTP) flags, and label the -s flag with a clear warning that it
will be removed in the near future (so no, don't use it in scripts!).

prompted by/feedback from deraadt@

Revision 1.229 / (download) - annotate - [select for diffs], Mon Aug 9 23:56:36 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.228: +7 -4 lines
Diff to previous 1.228 (colored)

make scp -3 the default for remote-to-remote copies. It provides a
much better and more intuitive user experience and doesn't require
exposing credentials to the source host.

thanks naddy@ for catching the missing argument in usage()

"Yes please!" - markus@
"makes a lot of sense" - deraadt@
"the right thing to do" - dtucker@

Revision 1.228 / (download) - annotate - [select for diffs], Mon Aug 9 23:49:31 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.227: +26 -71 lines
Diff to previous 1.227 (colored)

make scp in SFTP mode try to use relative paths as much as possible.
Previosuly, it would try to make relative and ~/-rooted paths absolute
before requesting transfers.

prompted by and much discussion deraadt@
ok markus@

Revision 1.227 / (download) - annotate - [select for diffs], Mon Aug 9 23:47:44 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.226: +11 -6 lines
Diff to previous 1.226 (colored)

SFTP protocol extension to allow the server to expand ~-prefixed
paths, in particular ~user ones. Allows scp in sftp mode to accept
these paths, like scp in rcp mode does.

prompted by and much discussion deraadt@
ok markus@

Revision 1.226 / (download) - annotate - [select for diffs], Mon Aug 9 23:44:32 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.225: +34 -10 lines
Diff to previous 1.225 (colored)

when scp is in SFTP mode, try to deal better with ~ prefixed
paths. ~user paths aren't supported, but ~/ paths will be accepted
and prefixed with the SFTP server starting directory (more to come)

prompted by and discussed with deraadt@
ok markus@

Revision 1.225 / (download) - annotate - [select for diffs], Mon Aug 9 07:21:01 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.224: +19 -1 lines
Diff to previous 1.224 (colored)

on fatal errors, make scp wait for ssh connection before exiting
avoids LogLevel=verbose (or greater) messages from ssh appearing
after scp has returned exited and control has returned to the
shell; ok markus@

(this was originally committed as r1.223 along with unrelated stuff that
I rolled back in r1.224)

Revision 1.224 / (download) - annotate - [select for diffs], Mon Aug 9 07:19:12 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.223: +24 -63 lines
Diff to previous 1.223 (colored)

rever r1.223 - I accidentally committed unrelated changes

Revision 1.223 / (download) - annotate - [select for diffs], Mon Aug 9 07:13:54 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.222: +64 -25 lines
Diff to previous 1.222 (colored)

on fatal errors, make scp wait for ssh connection before exiting
avoids LogLevel=verbose (or greater) messages from ssh appearing
after scp has returned exited and control has returned to the
shell; ok markus@

Revision 1.222 / (download) - annotate - [select for diffs], Sat Aug 7 01:57:08 2021 UTC (2 years, 9 months ago) by dtucker
Branch: MAIN
Changes since 1.221: +2 -2 lines
Diff to previous 1.221 (colored)

Fix prototype mismatch for do_cmd.  ok djm@

Revision 1.221 / (download) - annotate - [select for diffs], Sat Aug 7 00:12:09 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.220: +4 -4 lines
Diff to previous 1.220 (colored)

make scp(1) in SFTP mode follow symlinks like traditional scp(1)
ok markus@

Revision 1.220 / (download) - annotate - [select for diffs], Sat Aug 7 00:08:52 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.219: +4 -3 lines
Diff to previous 1.219 (colored)

make scp(1) in SFTP mode output better match original scp(1) by
suppressing "Retrieving [path]" lines that were emitted to support
the interactive sftp(1) client. ok markus@

Revision 1.219 / (download) - annotate - [select for diffs], Sat Aug 7 00:06:30 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.218: +189 -40 lines
Diff to previous 1.218 (colored)

use sftp_client crossloading to implement scp -3

feedback/ok markus@

Revision 1.218 / (download) - annotate - [select for diffs], Sat Aug 7 00:00:33 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.217: +6 -19 lines
Diff to previous 1.217 (colored)

prepare for scp -3 implemented via sftp

Revision 1.217 / (download) - annotate - [select for diffs], Wed Aug 4 01:34:55 2021 UTC (2 years, 9 months ago) by dtucker
Branch: MAIN
Changes since 1.216: +4 -3 lines
Diff to previous 1.216 (colored)

Allow for different (but POSIX compliant) behaviour of basename(3) and
prevent a use-after-free in that case in the new sftp-compat code.

POSIX allows basename(3) to either return a pointer to static storage
or modify the passed string and return a pointer to that.  OpenBSD does
the former and works as is, but on other platforms "filename" points
into "tmp" which was just freed.  This makes the freeing of tmp
consistent with the other variable in the loop.

Pinpointed by the -portable Valgrind regress test.  ok djm@ deraadt@

Revision 1.216 / (download) - annotate - [select for diffs], Mon Aug 2 23:38:27 2021 UTC (2 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.215: +279 -23 lines
Diff to previous 1.215 (colored)

support for using the SFTP protocol for file transfers in scp, via a
new "-M sftp" option. Marked as experimental for now.

Some corner-cases exist, in particular there is no attempt to
provide bug-compatibility with scp's weird "double shell" quoting
rules.

Mostly by Jakub Jelen in GHPR#194 with some tweaks by me. ok markus@
Thanks jmc@ for improving the scp.1 bits.

Revision 1.215 / (download) - annotate - [select for diffs], Mon Jul 5 00:25:42 2021 UTC (2 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.214: +10 -5 lines
Diff to previous 1.214 (colored)

allow spaces to appear in usernames for local to remote, and scp -3
remote to remote copies. with & ok dtucker bz#1164

Revision 1.214 / (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.213: +3 -4 lines
Diff to previous 1.213 (colored)

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

Revision 1.213 / (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.212: +3 -3 lines
Diff to previous 1.212 (colored)

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

Revision 1.212 / (download) - annotate - [select for diffs], Mon Aug 3 02:43:41 2020 UTC (3 years, 9 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.211: +7 -4 lines
Diff to previous 1.211 (colored)

allow -A to explicitly enable agent forwarding in scp and sftp. The
default remains to not forward an agent, even when ssh_config enables
it. ok jmc dtucker markus

Revision 1.211 / (download) - annotate - [select for diffs], Fri May 29 21:22:02 2020 UTC (3 years, 11 months ago) by millert
Branch: MAIN
Changes since 1.210: +7 -4 lines
Diff to previous 1.210 (colored)

Fix error message on close(2) and add printf format attributes.
From Christos Zoulas, OK markus@

Revision 1.210 / (download) - annotate - [select for diffs], Wed May 6 20:57:38 2020 UTC (4 years ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.209: +2 -4 lines
Diff to previous 1.209 (colored)

another case where a utimes() failure could make scp send a
desynchronising error; reminded by Aymeric Vincent
ok deraadt markus

Revision 1.209 / (download) - annotate - [select for diffs], Fri May 1 06:31:42 2020 UTC (4 years ago) by djm
Branch: MAIN
Changes since 1.208: +59 -37 lines
Diff to previous 1.208 (colored)

when receving a file in sink(), be careful to send at most a single
error response after the file has been opened. Otherwise the source()
and sink() can become desyncronised. Reported by Daniel Goujot,
Georges-Axel Jaloyan, Ryan Lahfa, and David Naccache.

ok deraadt@ markus@

Revision 1.208 / (download) - annotate - [select for diffs], Thu Apr 30 17:07:10 2020 UTC (4 years ago) by markus
Branch: MAIN
Changes since 1.207: +2 -1 lines
Diff to previous 1.207 (colored)

run the 2nd ssh with BatchMode for scp -3

Revision 1.207 / (download) - annotate - [select for diffs], Thu Jan 23 07:10:22 2020 UTC (4 years, 3 months ago) by dtucker
Branch: MAIN
Changes since 1.206: +11 -11 lines
Diff to previous 1.206 (colored)

Replace all calls to signal(2) with a wrapper around sigaction(2).
This wrapper blocks all other signals during the handler preventing
races between handlers, and sets SA_RESTART which should reduce the
potential for short read/write operations.

Revision 1.206 / (download) - annotate - [select for diffs], Mon Sep 9 02:31:19 2019 UTC (4 years, 8 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.205: +2 -2 lines
Diff to previous 1.205 (colored)

Fix potential truncation warning.  ok deraadt.

Revision 1.205 / (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.204: +12 -12 lines
Diff to previous 1.204 (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.204 / (download) - annotate - [select for diffs], Sun Feb 10 11:15:52 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.203: +270 -12 lines
Diff to previous 1.203 (colored)

when checking that filenames sent by the server side match what the
client requested, be prepared to handle shell-style brace alternations,
e.g. "{foo,bar}".

"looks good to me" millert@ + in snaps for the last week courtesy
deraadt@

Revision 1.203 / (download) - annotate - [select for diffs], Sun Jan 27 07:14:11 2019 UTC (5 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.202: +2 -2 lines
Diff to previous 1.202 (colored)

add -T to usage();

Revision 1.202 / (download) - annotate - [select for diffs], Sat Jan 26 22:41:28 2019 UTC (5 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.201: +30 -9 lines
Diff to previous 1.201 (colored)

check in scp client that filenames sent during remote->local directory
copies satisfy the wildcard specified by the user.

This checking provides some protection against a malicious server
sending unexpected filenames, but it comes at a risk of rejecting wanted
files due to differences between client and server wildcard expansion rules.

For this reason, this also adds a new -T flag to disable the check.

reported by Harry Sintonen
fix approach suggested by markus@;
has been in snaps for ~1wk courtesy deraadt@

Revision 1.201 / (download) - annotate - [select for diffs], Thu Jan 24 16:52:17 2019 UTC (5 years, 3 months ago) by dtucker
Branch: MAIN
Changes since 1.200: +2 -2 lines
Diff to previous 1.200 (colored)

Have progressmeter force an update at the beginning and end of each
transfer.  Fixes the problem recently introduces where very quick
transfers do not display the progressmeter at all.  Spotted by naddy@

Revision 1.200 / (download) - annotate - [select for diffs], Wed Jan 23 08:01:46 2019 UTC (5 years, 3 months ago) by dtucker
Branch: MAIN
Changes since 1.199: +2 -1 lines
Diff to previous 1.199 (colored)

Sanitize scp filenames via snmprintf.  To do this we move the
progressmeter formatting outside of signal handler context and have
the atomicio callback called for EINTR too.  bz#2434 with contributions
from djm and jjelen at redhat.com, ok djm@

Revision 1.199 / (download) - annotate - [select for diffs], Mon Jan 21 22:50:42 2019 UTC (5 years, 3 months ago) by tb
Branch: MAIN
Changes since 1.198: +5 -3 lines
Diff to previous 1.198 (colored)

Add a -J option as a shortcut for -o Proxyjump= to scp(1) and sftp(1)
to match ssh(1)'s interface.

ok djm

Revision 1.198 / (download) - annotate - [select for diffs], Fri Nov 16 03:03:10 2018 UTC (5 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.197: +3 -2 lines
Diff to previous 1.197 (colored)

disallow empty incoming filename or ones that refer to the current
directory; based on report/patch from Harry Sintonen

Revision 1.197 / (download) - annotate - [select for diffs], Fri Jun 1 04:31:48 2018 UTC (5 years, 11 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.196: +3 -1 lines
Diff to previous 1.196 (colored)

Apply umask to all incoming files and directories not just files.
This makes sure it gets applied to directories too, and prevents
a race where files get chmodded after creation.  bz#2839, ok djm@

Revision 1.196 / (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.195: +2 -2 lines
Diff to previous 1.195 (colored)

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

Revision 1.195 / (download) - annotate - [select for diffs], Sat Feb 10 06:15:12 2018 UTC (6 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.194: +3 -1 lines
Diff to previous 1.194 (colored)

Disable RemoteCommand and RequestTTY in the ssh session started by
scp. sftp is already doing this. From Camden Narzt via github;
ok dtucker

Revision 1.194 / (download) - annotate - [select for diffs], Mon Dec 18 17:28:54 2017 UTC (6 years, 4 months ago) by millert
Branch: MAIN
Changes since 1.193: +36 -11 lines
Diff to previous 1.193 (colored)

Add helper function for uri handing in scp where a missing path
simply means ".".  Also fix exit code and add warnings when an
invalid uri is encountered.  OK otto@

Revision 1.193 / (download) - annotate - [select for diffs], Sat Oct 21 23:06:24 2017 UTC (6 years, 6 months ago) by millert
Branch: MAIN
Changes since 1.192: +105 -94 lines
Diff to previous 1.192 (colored)

Add URI support to ssh, sftp and scp.  For example ssh://user@host
or sftp://user@host/path.  The connection parameters described in
draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since the
ssh fingerprint format in the draft uses md5 with no way to specify
the hash function type.  OK djm@

Revision 1.192 / (download) - annotate - [select for diffs], Wed May 31 09:15:42 2017 UTC (6 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.191: +2 -6 lines
Diff to previous 1.191 (colored)

Switch to recallocarray() for a few operations.  Both growth and shrinkage
are handled safely, and there also is no need for preallocation dances.
Future changes in this area will be less error prone.
Review and one bug found by markus

Revision 1.191 / (download) - annotate - [select for diffs], Tue May 2 08:06:33 2017 UTC (7 years ago) by jmc
Branch: MAIN
Changes since 1.190: +2 -2 lines
Diff to previous 1.190 (colored)

remove options -12 from usage();

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

exterminate the -1 flag from scp

ok markus@

Revision 1.189 / (download) - annotate - [select for diffs], Fri Apr 28 03:21:12 2017 UTC (7 years ago) by millert
Branch: MAIN
Changes since 1.188: +13 -6 lines
Diff to previous 1.188 (colored)

Avoid relying on implementation-specific behavior when detecting
whether the timestamp or file size overflowed.  If time_t and
off_t are not either 32-bit or 64-bit scp will exit with an error.
OK djm@

Revision 1.188 / (download) - annotate - [select for diffs], Thu Apr 27 11:53:12 2017 UTC (7 years ago) by millert
Branch: MAIN
Changes since 1.187: +9 -4 lines
Diff to previous 1.187 (colored)

Avoid potential signed int overflow when parsing the file size.
Use strtoul() instead of parsing manually.  OK djm@

Revision 1.187 / (download) - annotate - [select for diffs], Mon Sep 12 01:22:38 2016 UTC (7 years, 8 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.186: +3 -4 lines
Diff to previous 1.186 (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.186 / (download) - annotate - [select for diffs], Wed May 25 23:48:45 2016 UTC (7 years, 11 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.185: +28 -17 lines
Diff to previous 1.185 (colored)

To prevent screwing up terminal settings when printing to the
terminal, for ASCII and UTF-8, escape bytes not forming characters
and bytes forming non-printable characters with vis(3) VIS_OCTAL.
For other character sets, abort printing of the current string in
these cases.  In particular,
* let scp(1) respect the local user's LC_CTYPE locale(1);
* sanitize data received from the remote host;
* sanitize filenames, usernames, and similar data even locally;
* take character display widths into account for the progressmeter.

This is believed to be sufficient to keep the local terminal safe
on OpenBSD, but bad things can still happen on other systems with
state-dependent locales because many places in the code print
unencoded ASCII characters into the output stream.

Using feedback from djm@ and martijn@,
various aspects discussed with many others.

deraadt@ says it should go in now, i probably already hesitated too long

Revision 1.185 / (download) - annotate - [select for diffs], Wed Mar 2 22:43:52 2016 UTC (8 years, 2 months ago) by dtucker
Branch: MAIN
Changes since 1.184: +5 -5 lines
Diff to previous 1.184 (colored)

Improve accuracy of reported transfer speeds by waiting for the ack from
the other end.  Pointed out by mmcc@, ok deraadt@ markus@

Revision 1.184 / (download) - annotate - [select for diffs], Fri Nov 27 00:49:31 2015 UTC (8 years, 5 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.183: +11 -1 lines
Diff to previous 1.183 (colored)

pledge "stdio rpath wpath cpath fattr tty proc exec" except for the
-p option (which sadly has insane semantics...)
ok semarie dtucker

Revision 1.183 / (download) - annotate - [select for diffs], Fri Oct 16 17:07:24 2015 UTC (8 years, 7 months ago) by mmcc
Branch: MAIN
Changes since 1.182: +2 -2 lines
Diff to previous 1.182 (colored)

0 -> NULL when comparing with a char*.

ok dtucker@, djm@.

Revision 1.182 / (download) - annotate - [select for diffs], Fri Apr 24 01:36:00 2015 UTC (9 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.181: +2 -2 lines
Diff to previous 1.181 (colored)

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

Revision 1.181 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:12 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.180: +5 -4 lines
Diff to previous 1.180 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.180 / (download) - annotate - [select for diffs], Tue Jun 24 02:21:01 2014 UTC (9 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.179: +7 -3 lines
Diff to previous 1.179 (colored)

when copying local->remote fails during read, don't send uninitialised
heap to the remote end. Reported by Jann Horn

Revision 1.179 / (download) - annotate - [select for diffs], Wed Nov 20 20:53:10 2013 UTC (10 years, 5 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.178: +3 -3 lines
Diff to previous 1.178 (colored)

unsigned casts for ctype macros where neccessary
ok guenther millert markus

Revision 1.178 / (download) - annotate - [select for diffs], Sat Jun 22 06:31:57 2013 UTC (10 years, 10 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.177: +5 -3 lines
Diff to previous 1.177 (colored)

improved time_t overflow check suggested by guenther@

Revision 1.177 / (download) - annotate - [select for diffs], Fri Jun 21 05:43:10 2013 UTC (10 years, 10 months ago) by djm
Branch: MAIN
Changes since 1.176: +3 -3 lines
Diff to previous 1.176 (colored)

make this -Wsign-compare clean after time_t conversion

Revision 1.176 / (download) - annotate - [select for diffs], Mon Jun 17 04:48:42 2013 UTC (10 years, 11 months ago) by guenther
Branch: MAIN
Changes since 1.175: +38 -25 lines
Diff to previous 1.175 (colored)

Handle time_t values as long long's when formatting them and when
parsing them from remote servers.
Improve error checking in parsing of 'T' lines.

ok dtucker@ deraadt@

Revision 1.175 / (download) - annotate - [select for diffs], Tue Jun 4 19:12:23 2013 UTC (10 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.174: +2 -2 lines
Diff to previous 1.174 (colored)

use MAXPATHLEN for buffer size instead of fixed value.  ok markus

Revision 1.174 / (download) - annotate - [select for diffs], Sat Jun 1 20:59:25 2013 UTC (10 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.173: +2 -2 lines
Diff to previous 1.173 (colored)

Replace S_IWRITE, which isn't standardized, with S_IWUSR, which is.  Patch
from Nathan Osman via bz#2085.  ok deraadt.

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

bye, bye xfree(); ok markus@

Revision 1.172 / (download) - annotate - [select for diffs], Thu May 16 09:08:41 2013 UTC (11 years ago) by dtucker
Branch: MAIN
Changes since 1.171: +2 -2 lines
Diff to previous 1.171 (colored)

Fix some "unused result" warnings found via clang and -portable.  ok markus@

Revision 1.171 / (download) - annotate - [select for diffs], Fri Sep 9 22:37:01 2011 UTC (12 years, 8 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2, OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.170: +9 -5 lines
Diff to previous 1.170 (colored)

suppress adding '--' to remote commandlines when the first argument
does not start with '-'. saves breakage on some difficult-to-upgrade
embedded/router platforms; feedback & ok dtucker ok markus

Revision 1.170 / (download) - annotate - [select for diffs], Thu Dec 9 14:13:33 2010 UTC (13 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.169: +2 -2 lines
Diff to previous 1.169 (colored)

scp.1: grammer fix
scp.c: add -3 to usage()

Revision 1.169 / (download) - annotate - [select for diffs], Wed Dec 8 22:46:03 2010 UTC (13 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.168: +86 -3 lines
Diff to previous 1.168 (colored)

add a new -3 option to scp: Copies between two remote hosts are
transferred through the local host.  Without this option the data
is copied directly between the two remote hosts. ok djm@ (bugzilla #1837)

Revision 1.168 / (download) - annotate - [select for diffs], Fri Nov 26 05:52:49 2010 UTC (13 years, 5 months ago) by djm
Branch: MAIN
Changes since 1.167: +22 -10 lines
Diff to previous 1.167 (colored)

Pass through ssh command-line flags and options when doing remote-remote
transfers, e.g. to enable agent forwarding which is particularly useful
in this case; bz#1837 ok dtucker@

Revision 1.167 / (download) - annotate - [select for diffs], Wed Sep 22 22:58:51 2010 UTC (13 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.166: +22 -99 lines
Diff to previous 1.166 (colored)

add an option per-read/write callback to atomicio

factor out bandwidth limiting code from scp(1) into a generic bandwidth
limiter that can be attached using the atomicio callback mechanism

add a bandwidth limit option to sftp(1) using the above

"very nice" markus@

Revision 1.166 / (download) - annotate - [select for diffs], Thu Jul 1 13:06:59 2010 UTC (13 years, 10 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.165: +19 -1 lines
Diff to previous 1.165 (colored)

Fix a longstanding problem where if you suspend scp at the
password/passphrase prompt the terminal mode is not restored.
OK djm@

Revision 1.165 / (download) - annotate - [select for diffs], Sun Dec 20 07:28:36 2009 UTC (14 years, 4 months ago) by guenther
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.164: +14 -7 lines
Diff to previous 1.164 (colored)

When passing user-controlled options with arguments to other programs,
pass the option and option argument as separate argv entries and
not smashed into one (e.g., as -l foo and not -lfoo).  Also, always
pass a "--" argument to stop option parsing, so that a positional
argument that starts with a '-' isn't treated as an option.  This
fixes some error cases as well as the handling of hostnames and
filenames that start with a '-'.

Based on a diff by halex@
ok halex@ djm@ deraadt@

Revision 1.164 / (download) - annotate - [select for diffs], Fri Oct 10 04:55:16 2008 UTC (15 years, 7 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.163: +2 -2 lines
Diff to previous 1.163 (colored)

spelling in comment; ok djm@

Revision 1.163 / (download) - annotate - [select for diffs], Fri Jun 13 18:55:22 2008 UTC (15 years, 11 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.162: +8 -3 lines
Diff to previous 1.162 (colored)

Prevent -Wsign-compare warnings on LP64 systems.  bz #1192, ok deraadt@

Revision 1.162 / (download) - annotate - [select for diffs], Tue Jan 1 09:06:39 2008 UTC (16 years, 4 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.161: +9 -3 lines
Diff to previous 1.161 (colored)

If scp -p encounters a pre-epoch timestamp, use the epoch which is
as close as we can get given that it's used unsigned.  Add a little
debugging while there.  bz #828, ok djm@

Revision 1.161 / (download) - annotate - [select for diffs], Wed Oct 24 03:44:02 2007 UTC (16 years, 6 months ago) by djm
Branch: MAIN
Changes since 1.160: +63 -27 lines
Diff to previous 1.160 (colored)

factor out network read/write into an atomicio()-like function, and use it
to handle short reads, apply bandwidth limits and update counters.
make network IO non-blocking, so a small trickle of reads/writes has a
chance of updating the progress meter; bz #799
ok dtucker@

Revision 1.160 / (download) - annotate - [select for diffs], Mon Aug 6 19:16:06 2007 UTC (16 years, 9 months ago) by sobrado
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.159: +2 -2 lines
Diff to previous 1.159 (colored)

the ellipsis is not an optional argument; while here, sync the usage
and synopsis of commands

lots of good ideas by jmc@

ok jmc@

Revision 1.159 / (download) - annotate - [select for diffs], Wed Jun 13 00:21:27 2007 UTC (16 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.158: +3 -2 lines
Diff to previous 1.158 (colored)

don't ftruncate() non-regular files; bz#1236 reported by wood AT xmission.com;
ok dtucker@

Revision 1.158 / (download) - annotate - [select for diffs], Tue Jun 12 13:54:28 2007 UTC (16 years, 11 months ago) by dtucker
Branch: MAIN
Changes since 1.157: +7 -7 lines
Diff to previous 1.157 (colored)

Encode filename with strnvis if the name contains a newline (which can't
be represented in the scp protocol), from bz #891.  ok markus@

Revision 1.157 / (download) - annotate - [select for diffs], Tue Jun 12 08:24:20 2007 UTC (16 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.156: +3 -2 lines
Diff to previous 1.156 (colored)

make scp try to skip FIFOs rather than blocking when nothing is listening.
depends on the platform supporting sane O_NONBLOCK semantics for open
on FIFOs (apparently POSIX does not mandate this), which OpenBSD does.
bz #856; report by cjwatson AT debian.org; ok markus@

Revision 1.156 / (download) - annotate - [select for diffs], Mon Jan 22 13:06:21 2007 UTC (17 years, 3 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.155: +2 -2 lines
Diff to previous 1.155 (colored)

fix detection of whether we should show progress meter or not: scp
tested isatty(stderr) but wrote the progress meter to stdout. This patch
makes it test stdout. bz#1265 reported by junkmail AT bitsculpture.com;
of dtucker@

Revision 1.125.2.2 / (download) - annotate - [select for diffs], Fri Oct 6 03:19:33 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.125.2.1: +51 -29 lines
Diff to previous 1.125.2.1 (colored) to branchpoint 1.125 (colored) next main 1.126 (colored)

upgrade to OpenSSH 4.4

Revision 1.135.2.1 / (download) - annotate - [select for diffs], Sat Sep 30 04:06:51 2006 UTC (17 years, 7 months ago) by brad
Branch: OPENBSD_3_9
Changes since 1.135: +44 -30 lines
Diff to previous 1.135 (colored) next main 1.136 (colored)

upgrade to OpenSSH 4.4

Revision 1.155 / (download) - annotate - [select for diffs], Thu Aug 3 03:34:42 2006 UTC (17 years, 9 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.154: +3 -4 lines
Diff to previous 1.154 (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.154 / (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.153: +2 -1 lines
Diff to previous 1.153 (colored)

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

Revision 1.153 / (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.152: +2 -1 lines
Diff to previous 1.152 (colored)

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

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

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

Revision 1.151 / (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.150: +2 -1 lines
Diff to previous 1.150 (colored)

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

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

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

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

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

Revision 1.148 / (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.147: +2 -1 lines
Diff to previous 1.147 (colored)

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

Revision 1.147 / (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.146: +2 -1 lines
Diff to previous 1.146 (colored)

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

Revision 1.146 / (download) - annotate - [select for diffs], Mon Jul 10 16:37:36 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.145: +2 -1 lines
Diff to previous 1.145 (colored)

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

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

duplicate argv at the start of main() because it gets modified later;
pointed out by deraadt@ ok markus@

Revision 1.144 / (download) - annotate - [select for diffs], Sun Jul 9 15:15:10 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.143: +2 -1 lines
Diff to previous 1.143 (colored)

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

Revision 1.143 / (download) - annotate - [select for diffs], Thu Jul 6 16:03:53 2006 UTC (17 years, 10 months ago) by stevesk
Branch: MAIN
Changes since 1.142: +2 -1 lines
Diff to previous 1.142 (colored)

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

Revision 1.142 / (download) - annotate - [select for diffs], Wed May 17 12:43:34 2006 UTC (18 years ago) by markus
Branch: MAIN
Changes since 1.141: +4 -2 lines
Diff to previous 1.141 (colored)

fix leak; coverity via Kylene Jo Hall

Revision 1.141 / (download) - annotate - [select for diffs], Sat Apr 1 05:50:29 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.140: +3 -9 lines
Diff to previous 1.140 (colored)

xasprintification; ok deraadt@

Revision 1.140 / (download) - annotate - [select for diffs], Sat Apr 1 05:42:20 2006 UTC (18 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.139: +11 -9 lines
Diff to previous 1.139 (colored)

minimal lint cleanup (unused crud, and some size_t); ok djm

Revision 1.139 / (download) - annotate - [select for diffs], Sat Mar 25 13:17:02 2006 UTC (18 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.138: +1 -0 lines
Diff to previous 1.138 (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.138 / (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.137: +1 -1 lines
Diff to previous 1.137 (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.137 / (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.136: +0 -1 lines
Diff to previous 1.136 (colored)

RCSID() can die

Revision 1.136 / (download) - annotate - [select for diffs], Thu Mar 16 10:31:45 2006 UTC (18 years, 2 months ago) by biorn
Branch: MAIN
Changes since 1.135: +10 -10 lines
Diff to previous 1.135 (colored)

Try to display errormessage even if remout == -1

ok djm@, markus@

Revision 1.135 / (download) - annotate - [select for diffs], Wed Feb 22 00:04:44 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.134: +2 -1 lines
Diff to previous 1.134 (colored)

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

Revision 1.134 / (download) - annotate - [select for diffs], Mon Feb 20 17:19:54 2006 UTC (18 years, 2 months ago) by stevesk
Branch: MAIN
Changes since 1.133: +2 -1 lines
Diff to previous 1.133 (colored)

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

Revision 1.133 / (download) - annotate - [select for diffs], Mon Feb 20 17:02:44 2006 UTC (18 years, 2 months ago) by stevesk
Branch: MAIN
Changes since 1.132: +2 -1 lines
Diff to previous 1.132 (colored)

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

Revision 1.132 / (download) - annotate - [select for diffs], Fri Feb 10 01:44:26 2006 UTC (18 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.131: +4 -1 lines
Diff to previous 1.131 (colored)

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

Revision 1.131 / (download) - annotate - [select for diffs], Wed Feb 8 23:51:24 2006 UTC (18 years, 3 months ago) by stevesk
Branch: MAIN
Changes since 1.130: +3 -1 lines
Diff to previous 1.130 (colored)

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

Revision 1.125.2.1 / (download) - annotate - [select for diffs], Fri Feb 3 03:01:56 2006 UTC (18 years, 3 months ago) by brad
Branch: OPENBSD_3_8
Changes since 1.125: +101 -49 lines
Diff to previous 1.125 (colored)

upgrade to OpenSSH 4.3

Revision 1.119.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.119.2.1: +101 -49 lines
Diff to previous 1.119.2.1 (colored) to branchpoint 1.119 (colored) next main 1.120 (colored)

upgrade to OpenSSH 4.3

Revision 1.130 / (download) - annotate - [select for diffs], Tue Jan 31 10:35:43 2006 UTC (18 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.129: +2 -2 lines
Diff to previous 1.129 (colored)

"scp a b c" shouldn't clobber "c" when it is not a directory, report and
fix from biorn@; ok markus@

Revision 1.129 / (download) - annotate - [select for diffs], Tue Jan 31 10:19:02 2006 UTC (18 years, 3 months ago) by djm
Branch: MAIN
Changes since 1.128: +87 -45 lines
Diff to previous 1.128 (colored)

fix local arbitrary command execution vulnerability on local/local and
remote/remote copies (CVE-2006-0225, bz #1094), patch by
t8m AT centrum.cz, polished by dtucker@ and myself; ok markus@

Revision 1.128 / (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.127: +2 -1 lines
Diff to previous 1.127 (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.127 / (download) - annotate - [select for diffs], Sat Nov 12 18:38:15 2005 UTC (18 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.126: +10 -4 lines
Diff to previous 1.126 (colored)

avoid close(-1), as in rcp; ok cloder

Revision 1.126 / (download) - annotate - [select for diffs], Tue Sep 13 23:40:07 2005 UTC (18 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.125: +4 -1 lines
Diff to previous 1.125 (colored)

ensure that stdio fds are attached; ok deraadt@

Revision 1.119.2.1 / (download) - annotate - [select for diffs], Sun Sep 4 18:40:03 2005 UTC (18 years, 8 months ago) by brad
Branch: OPENBSD_3_7
Changes since 1.119: +28 -23 lines
Diff to previous 1.119 (colored)

upgrade to OpenSSH 4.2

Revision 1.117.2.2 / (download) - annotate - [select for diffs], Fri Sep 2 03:45:00 2005 UTC (18 years, 8 months ago) by brad
Branch: OPENBSD_3_6
Changes since 1.117.2.1: +28 -23 lines
Diff to previous 1.117.2.1 (colored) to branchpoint 1.117 (colored) next main 1.118 (colored)

upgrade to OpenSSH 4.2

Revision 1.125 / (download) - annotate - [select for diffs], Wed Jul 27 10:39:03 2005 UTC (18 years, 9 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE
Branch point for: OPENBSD_3_8
Changes since 1.124: +2 -2 lines
Diff to previous 1.124 (colored)

Silence bogus -Wuninitialized warnings; ok djm@

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

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

Revision 1.123 / (download) - annotate - [select for diffs], Thu May 26 02:08:05 2005 UTC (18 years, 11 months ago) by avsm
Branch: MAIN
Changes since 1.122: +6 -4 lines
Diff to previous 1.122 (colored)

If copying multiple files to a target file (which normally fails, as it
must be a target directory), kill the spawned ssh child before exiting.
This stops it trying to authenticate and spewing lots of output.
deraadt@ ok

Revision 1.122 / (download) - annotate - [select for diffs], Tue May 24 17:32:43 2005 UTC (18 years, 11 months ago) by avsm
Branch: MAIN
Changes since 1.121: +14 -12 lines
Diff to previous 1.121 (colored)

Switch atomicio to use a simpler interface; it now returns a size_t
(containing number of bytes read/written), and indicates error by
returning 0.  EOF is signalled by errno==EPIPE.
Typical use now becomes:

if (atomicio(read, ..., len) != len)
        err(1,"read");

ok deraadt@, cloder@, djm@

Revision 1.121 / (download) - annotate - [select for diffs], Sat Apr 2 12:41:16 2005 UTC (19 years, 1 month ago) by djm
Branch: MAIN
Changes since 1.120: +2 -4 lines
Diff to previous 1.120 (colored)

since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror build

Revision 1.120 / (download) - annotate - [select for diffs], Thu Mar 31 18:39:21 2005 UTC (19 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.119: +8 -5 lines
Diff to previous 1.119 (colored)

copy argv[] element instead of smashing the one that ps will see; ok otto

Revision 1.113.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.113.2.1: +5 -3 lines
Diff to previous 1.113.2.1 (colored) to branchpoint 1.113 (colored) next main 1.114 (colored)

upgrade to OpenSSH 4.0

Revision 1.117.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.117: +5 -3 lines
Diff to previous 1.117 (colored)

upgrade to OpenSSH 4.0

Revision 1.119 / (download) - annotate - [select for diffs], Mon Jan 24 10:22:06 2005 UTC (19 years, 3 months ago) by dtucker
Branch: MAIN
CVS Tags: OPENBSD_3_7_BASE
Branch point for: OPENBSD_3_7
Changes since 1.118: +4 -2 lines
Diff to previous 1.118 (colored)

Have scp and sftp wait for the spawned ssh to exit before they exit
themselves.  This prevents ssh from being unable to restore terminal
modes (not normally a problem on OpenBSD but common with -Portable
on POSIX platforms).  From peak at argo.troja.mff.cuni.cz (bz#950);
ok djm@ markus@

Revision 1.118 / (download) - annotate - [select for diffs], Wed Sep 15 18:46:04 2004 UTC (19 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.117: +2 -2 lines
Diff to previous 1.117 (colored)

scratch that do { } while (0) wrapper in this case

Revision 1.108.2.2 / (download) - annotate - [select for diffs], Thu Aug 19 22:37:32 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.108.2.1: +21 -12 lines
Diff to previous 1.108.2.1 (colored) to branchpoint 1.108 (colored) next main 1.109 (colored)

upgrade to OpenSSH 3.9

Revision 1.113.2.1 / (download) - annotate - [select for diffs], Thu Aug 19 04:13:27 2004 UTC (19 years, 9 months ago) by brad
Branch: OPENBSD_3_5
Changes since 1.113: +21 -12 lines
Diff to previous 1.113 (colored)

upgrade to OpenSSH 3.9

Revision 1.117 / (download) - annotate - [select for diffs], Wed Aug 11 21:44:32 2004 UTC (19 years, 9 months ago) by avsm
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE
Branch point for: OPENBSD_3_6
Changes since 1.116: +3 -6 lines
Diff to previous 1.116 (colored)

use atomicio instead of homegrown equivalents or read/write.
markus@ ok

Revision 1.116 / (download) - annotate - [select for diffs], Thu Jul 8 12:47:21 2004 UTC (19 years, 10 months ago) by dtucker
Branch: MAIN
Changes since 1.115: +7 -3 lines
Diff to previous 1.115 (colored)

Prevent scp from skipping the file following a double-error.
bz #863, ok markus@

Revision 1.115 / (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.114: +5 -5 lines
Diff to previous 1.114 (colored)

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

Revision 1.114 / (download) - annotate - [select for diffs], Thu Apr 1 12:19:57 2004 UTC (20 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.113: +9 -1 lines
Diff to previous 1.113 (colored)

limit trust between local and remote rcp/scp process,
noticed by lcamtuf; ok deraadt@, djm@

Revision 1.102.2.2 / (download) - annotate - [select for diffs], Thu Mar 4 18:18:16 2004 UTC (20 years, 2 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.102.2.1: +12 -10 lines
Diff to previous 1.102.2.1 (colored) to branchpoint 1.102 (colored) next main 1.103 (colored)

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

Revision 1.108.2.1 / (download) - annotate - [select for diffs], Sat Feb 28 03:51:33 2004 UTC (20 years, 2 months ago) by brad
Branch: OPENBSD_3_4
Changes since 1.108: +12 -10 lines
Diff to previous 1.108 (colored)

upgrade to OpenSSH 3.8

Revision 1.113 / (download) - annotate - [select for diffs], Sun Nov 23 23:21:21 2003 UTC (20 years, 5 months ago) by djm
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE
Branch point for: OPENBSD_3_5
Changes since 1.112: +6 -6 lines
Diff to previous 1.112 (colored)

from portable: rename clashing variable limit-> limit_rate; ok markus@

Revision 1.112 / (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.111: +2 -2 lines
Diff to previous 1.111 (colored)

unexpand and delete whitespace at EOL; ok markus@

Revision 1.111 / (download) - annotate - [select for diffs], Wed Nov 12 10:12:15 2003 UTC (20 years, 6 months ago) by dtucker
Branch: MAIN
Changes since 1.110: +2 -1 lines
Diff to previous 1.110 (colored)

When called with -q, pass -q to ssh; suppresses SSH2 banner.  ok markus@

Revision 1.110 / (download) - annotate - [select for diffs], Wed Oct 8 08:27:36 2003 UTC (20 years, 7 months ago) by jmc
Branch: MAIN
Changes since 1.109: +3 -3 lines
Diff to previous 1.109 (colored)

scp and sftp: add options list and sort options. options list requested
by deraadt@
sshd: use same format as ssh
ssh: remove wrong option from list
sftp-server: Subsystem is documented in ssh_config(5), not sshd(8)

ok deraadt@ markus@

Revision 1.109 / (download) - annotate - [select for diffs], Fri Sep 19 17:40:20 2003 UTC (20 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.108: +3 -2 lines
Diff to previous 1.108 (colored)

error handling for remote-remote copy; #638; report Harald Koenig;
ok millert, fgs, henning, deraadt

Revision 1.91.2.2 / (download) - annotate - [select for diffs], Tue Sep 16 21:20:27 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_2
Changes since 1.91.2.1: +44 -53 lines
Diff to previous 1.91.2.1 (colored) to branchpoint 1.91 (colored) next main 1.92 (colored)

upgrade to OpenSSH 3.7

Revision 1.102.2.1 / (download) - annotate - [select for diffs], Tue Sep 16 20:50:43 2003 UTC (20 years, 8 months ago) by brad
Branch: OPENBSD_3_3
Changes since 1.102: +44 -53 lines
Diff to previous 1.102 (colored)

upgrade to OpenSSH 3.7

Revision 1.108 / (download) - annotate - [select for diffs], Fri Jul 18 01:54:25 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE
Branch point for: OPENBSD_3_4
Changes since 1.107: +2 -2 lines
Diff to previous 1.107 (colored)

userid is unsigned, but well, force it anyways; andrushock@korovino.net

Revision 1.107 / (download) - annotate - [select for diffs], Sat Jun 28 16:23:06 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.106: +18 -18 lines
Diff to previous 1.106 (colored)

deal with typing of write vs read in atomicio

Revision 1.106 / (download) - annotate - [select for diffs], Thu Jun 12 15:34:09 2003 UTC (20 years, 11 months ago) by nino
Branch: MAIN
Changes since 1.105: +2 -2 lines
Diff to previous 1.105 (colored)

Typo.

Ok markus@.

Revision 1.105 / (download) - annotate - [select for diffs], Wed Jun 4 12:40:39 2003 UTC (20 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.104: +14 -2 lines
Diff to previous 1.104 (colored)

kill ssh process upon receipt of signal, bz #241.
based on patch from esb AT hawaii.edu; ok markus@

Revision 1.104 / (download) - annotate - [select for diffs], Wed Jun 4 12:18:49 2003 UTC (20 years, 11 months ago) by djm
Branch: MAIN
Changes since 1.103: +11 -28 lines
Diff to previous 1.103 (colored)

ansify; ok markus@

Revision 1.103 / (download) - annotate - [select for diffs], Tue Jun 3 02:56:16 2003 UTC (20 years, 11 months ago) by millert
Branch: MAIN
Changes since 1.102: +2 -6 lines
Diff to previous 1.102 (colored)

Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999.  Proofed by myself and Theo.

Revision 1.88.2.2 / (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.88.2.1: +137 -195 lines
Diff to previous 1.88.2.1 (colored) to branchpoint 1.88 (colored) next main 1.89 (colored)

Merge OpenSSH 3.6.1

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

Update to OpenSSH 3.6

Revision 1.102 / (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.101: +7 -3 lines
Diff to previous 1.101 (colored)

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

Revision 1.101 / (download) - annotate - [select for diffs], Sun Feb 2 10:51:13 2003 UTC (21 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.100: +15 -8 lines
Diff to previous 1.100 (colored)

call okname() only when using system(3) for remote-remote copy;
fixes bugs #483, #472; ok deraadt@, mouring@

Revision 1.100 / (download) - annotate - [select for diffs], Thu Jan 23 14:06:15 2003 UTC (21 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.99: +5 -3 lines
Diff to previous 1.99 (colored)

scp -12; Sam Smith and others; ok provos@, deraadt@

Revision 1.99 / (download) - annotate - [select for diffs], Thu Jan 23 14:01:53 2003 UTC (21 years, 3 months ago) by markus
Branch: MAIN
Changes since 1.98: +76 -4 lines
Diff to previous 1.98 (colored)

bandwidth limitation patch (scp -l) from niels@; ok todd@, deraadt@

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

Don't ftruncate after write error, creating sparse files of incorrect length
mindrot bug #403, reported by rusr@cup.hp.com; ok markus@

Revision 1.97 / (download) - annotate - [select for diffs], Fri Jan 10 08:19:07 2003 UTC (21 years, 4 months ago) by fgsch
Branch: MAIN
Changes since 1.96: +9 -177 lines
Diff to previous 1.96 (colored)

sftp progress meter support.
original diffs by Nils Nordman <nino at nforced dot com> via markus@, merged
to -current by me, djm@ ok.

Revision 1.96 / (download) - annotate - [select for diffs], Fri Dec 13 15:20:52 2002 UTC (21 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.95: +35 -30 lines
Diff to previous 1.95 (colored)

1) include stalling time in total time
2) truncate filenames to 45 instead of 20 characters
3) print rate instead of progress bar, no more stars
4) scale output to tty width
based on a patch from Niels; ok fries@ lebel@ fgs@ millert@

Revision 1.95 / (download) - annotate - [select for diffs], Thu Dec 5 11:08:35 2002 UTC (21 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.94: +3 -5 lines
Diff to previous 1.94 (colored)

use roundup() similar to rcp/util.c and avoid problems with strange
filesystem block sizes, noted by tjr@freebsd.org; ok djm@

Revision 1.94 / (download) - annotate - [select for diffs], Wed Nov 27 17:53:35 2002 UTC (21 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.93: +5 -5 lines
Diff to previous 1.93 (colored)

allow usernames with embedded '@', e.g. scp user@vhost@realhost:file /tmp;
http://bugzilla.mindrot.org/show_bug.cgi?id=447; ok mouring@, millert@

Revision 1.93 / (download) - annotate - [select for diffs], Tue Nov 26 00:45:03 2002 UTC (21 years, 5 months ago) by wcobb
Branch: MAIN
Changes since 1.92: +1 -2 lines
Diff to previous 1.92 (colored)

Remove unnecessary fflush(stderr) calls, stderr is unbuffered by default.
ok markus@

Revision 1.92 / (download) - annotate - [select for diffs], Thu Nov 7 22:35:38 2002 UTC (21 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.91: +26 -3 lines
Diff to previous 1.91 (colored)

check exit status from ssh, and exit(1) if ssh fails; bug#369; binder@arago.de

Revision 1.88.2.1 / (download) - annotate - [select for diffs], Wed Jun 26 15:30:38 2002 UTC (21 years, 10 months ago) by jason
Branch: OPENBSD_3_1
Changes since 1.88: +6 -8 lines
Diff to previous 1.88 (colored)

Pull in OpenSSH-3.4

Revision 1.85.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.85.2.2: +6 -8 lines
Diff to previous 1.85.2.2 (colored) to branchpoint 1.85 (colored) next main 1.86 (colored)

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

Revision 1.91 / (download) - annotate - [select for diffs], Wed Jun 19 00:27:55 2002 UTC (21 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE
Branch point for: OPENBSD_3_2
Changes since 1.90: +2 -2 lines
Diff to previous 1.90 (colored)

KNF done automatically while reading....

Revision 1.90 / (download) - annotate - [select for diffs], Mon Jun 17 06:05:56 2002 UTC (21 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.89: +4 -4 lines
Diff to previous 1.89 (colored)

make usage like man page

Revision 1.89 / (download) - annotate - [select for diffs], Sat Jun 8 12:36:53 2002 UTC (21 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.88: +2 -4 lines
Diff to previous 1.88 (colored)

remove FallBackToRsh

Revision 1.68.2.4 / (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.68.2.3: +10 -7 lines
Diff to previous 1.68.2.3 (colored) to branchpoint 1.68 (colored) next main 1.69 (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.85.2.2 / (download) - annotate - [select for diffs], Fri May 17 00:03:24 2002 UTC (22 years ago) by miod
Branch: OPENBSD_3_0
Changes since 1.85.2.1: +10 -7 lines
Diff to previous 1.85.2.1 (colored) to branchpoint 1.85 (colored)

Update OpenSSH to version 3.2.2.

Revision 1.88 / (download) - annotate - [select for diffs], Sat Apr 6 18:24:09 2002 UTC (22 years, 1 month ago) by mouring
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE
Branch point for: OPENBSD_3_1
Changes since 1.87: +2 -2 lines
Diff to previous 1.87 (colored)

Fixes potental double // within path.
http://bugzilla.mindrot.org/show_bug.cgi?id=76

Revision 1.87 / (download) - annotate - [select for diffs], Sat Mar 30 17:45:46 2002 UTC (22 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.86: +9 -6 lines
Diff to previous 1.86 (colored)

stretch banners

Revision 1.68.2.3 / (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.68.2.2: +3 -3 lines
Diff to previous 1.68.2.2 (colored) to branchpoint 1.68 (colored)

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

Revision 1.43.2.7 / (download) - annotate - [select for diffs], Fri Mar 8 17:04:43 2002 UTC (22 years, 2 months ago) by brad
Branch: OPENBSD_2_8
Changes since 1.43.2.6: +3 -3 lines
Diff to previous 1.43.2.6 (colored) to branchpoint 1.43 (colored) next main 1.44 (colored)

Merge OpenSSH 3.1.

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

Update to OpenSSH-3.1 on 3.0-stable branch

Revision 1.86 / (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.85: +3 -3 lines
Diff to previous 1.85 (colored)

make it compile with more strict prototype checking

Revision 1.68.2.2 / (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.68.2.1: +6 -1 lines
Diff to previous 1.68.2.1 (colored) to branchpoint 1.68 (colored)

Merge OpenSSH 3.0

Revision 1.43.2.6 / (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.43.2.5: +6 -1 lines
Diff to previous 1.43.2.5 (colored) to branchpoint 1.43 (colored)

Merge OpenSSH 3.0

Revision 1.85 / (download) - annotate - [select for diffs], Mon Oct 1 08:06:28 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.84: +6 -1 lines
Diff to previous 1.84 (colored)

skip filenames containing \n; report jdamery@chiark.greenend.org.uk
and matthew@debian.org

Revision 1.68.2.1 / (download) - annotate - [select for diffs], Thu Sep 27 19:03:55 2001 UTC (22 years, 7 months ago) by jason
Branch: OPENBSD_2_9
Changes since 1.68: +62 -81 lines
Diff to previous 1.68 (colored)

Pull in OpenSSH-2.9.9

Revision 1.43.2.5 / (download) - annotate - [select for diffs], Thu Sep 27 00:15:42 2001 UTC (22 years, 7 months ago) by miod
Branch: OPENBSD_2_8
Changes since 1.43.2.4: +62 -81 lines
Diff to previous 1.43.2.4 (colored) to branchpoint 1.43 (colored)

Pull in OpenSSH 2.9.9 to the 2.8 branch.

Revision 1.84 / (download) - annotate - [select for diffs], Wed Sep 19 19:24:19 2001 UTC (22 years, 8 months ago) by stevesk
Branch: MAIN
Changes since 1.83: +11 -6 lines
Diff to previous 1.83 (colored)

add ClearAllForwardings ssh option and set it in scp and sftp; ok markus@

Revision 1.83 / (download) - annotate - [select for diffs], Mon Sep 17 17:57:56 2001 UTC (22 years, 8 months ago) by stevesk
Branch: MAIN
Changes since 1.82: +6 -5 lines
Diff to previous 1.82 (colored)

add -Fssh_config option; ok markus@

Revision 1.82 / (download) - annotate - [select for diffs], Wed Sep 12 18:18:25 2001 UTC (22 years, 8 months ago) by stevesk
Branch: MAIN
Changes since 1.81: +2 -1 lines
Diff to previous 1.81 (colored)

don't forward agent for non third-party copies; ok markus@

Revision 1.81 / (download) - annotate - [select for diffs], Wed Aug 29 20:44:03 2001 UTC (22 years, 8 months ago) by markus
Branch: MAIN
Changes since 1.80: +2 -1 lines
Diff to previous 1.80 (colored)

clear the malloc'd buffer, otherwise source() will leak malloc'd memory; ok theo@

Revision 1.80 / (download) - annotate - [select for diffs], Mon Aug 13 23:38:54 2001 UTC (22 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.79: +1 -2 lines
Diff to previous 1.79 (colored)

don't need main prototype (also sync with rcp); ok markus@

Revision 1.79 / (download) - annotate - [select for diffs], Mon Aug 6 19:47:05 2001 UTC (22 years, 9 months ago) by stevesk
Branch: MAIN
Changes since 1.78: +7 -15 lines
Diff to previous 1.78 (colored)

use alarm vs. setitimer for portable; ok markus@

Revision 1.78 / (download) - annotate - [select for diffs], Fri Jul 27 17:26:16 2001 UTC (22 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.77: +11 -6 lines
Diff to previous 1.77 (colored)

shorten lines

Revision 1.77 / (download) - annotate - [select for diffs], Wed Jul 18 16:45:52 2001 UTC (22 years, 10 months ago) by mouring
Branch: MAIN
Changes since 1.76: +3 -2 lines
Diff to previous 1.76 (colored)

Missing -o in scp usage()

Revision 1.76 / (download) - annotate - [select for diffs], Sat Jun 23 15:12:19 2001 UTC (22 years, 10 months ago) by itojun
Branch: MAIN
Changes since 1.75: +5 -4 lines
Diff to previous 1.75 (colored)

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

Revision 1.75 / (download) - annotate - [select for diffs], Sat Jun 23 00:16:16 2001 UTC (22 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.74: +3 -3 lines
Diff to previous 1.74 (colored)

slightly better care

Revision 1.74 / (download) - annotate - [select for diffs], Sat Jun 16 08:57:35 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.73: +6 -3 lines
Diff to previous 1.73 (colored)

no stdio or exit() in signal handlers.

Revision 1.73 / (download) - annotate - [select for diffs], Sun Jun 10 11:33:02 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.72: +5 -3 lines
Diff to previous 1.72 (colored)

you cannot vfprintf(fp, fmt, ap) twice, from portable, via drahn@

Revision 1.72 / (download) - annotate - [select for diffs], Sun Jun 3 19:38:42 2001 UTC (22 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.71: +2 -1 lines
Diff to previous 1.71 (colored)

pass -v to ssh; from slade@shore.net

Revision 1.71 / (download) - annotate - [select for diffs], Sat May 19 16:05:41 2001 UTC (23 years ago) by markus
Branch: MAIN
Changes since 1.70: +2 -4 lines
Diff to previous 1.70 (colored)

ftruncate() instead of open()+O_TRUNC like rcp.c does
allows scp /path/to/file localhost:/path/to/file

Revision 1.70 / (download) - annotate - [select for diffs], Tue May 8 19:45:24 2001 UTC (23 years ago) by mouring
Branch: MAIN
Changes since 1.69: +13 -42 lines
Diff to previous 1.69 (colored)

Use addargs() in sftp plus some clean up of addargs().  OK Markus

Revision 1.43.2.4 / (download) - annotate - [select for diffs], Mon May 7 21:09:33 2001 UTC (23 years ago) by jason
Branch: OPENBSD_2_8
Changes since 1.43.2.3: +28 -67 lines
Diff to previous 1.43.2.3 (colored) to branchpoint 1.43 (colored)

Pull in OpenSSH-2.9 to 2.8 branch.

Revision 1.69 / (download) - annotate - [select for diffs], Thu May 3 23:09:53 2001 UTC (23 years ago) by mouring
Branch: MAIN
Changes since 1.68: +2 -2 lines
Diff to previous 1.68 (colored)

Move colon() and cleanhost() to misc.c where I should I have put it in
the first place

Revision 1.68 / (download) - annotate - [select for diffs], Sun Apr 22 12:34:05 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.67: +4 -4 lines
Diff to previous 1.67 (colored)

scp > 2GB; niles@scyld.com; ok deraadt@, djm@

Revision 1.67 / (download) - annotate - [select for diffs], Mon Apr 16 02:31:43 2001 UTC (23 years, 1 month ago) by mouring
Branch: MAIN
Changes since 1.66: +2 -38 lines
Diff to previous 1.66 (colored)

IPv6 support for sftp (which I bungled in my last patch) which is
borrowed from scp.c.  Thanks to Markus@ for pointing it out.

Revision 1.66 / (download) - annotate - [select for diffs], Sat Apr 14 17:04:42 2001 UTC (23 years, 1 month ago) by stevesk
Branch: MAIN
Changes since 1.65: +11 -14 lines
Diff to previous 1.65 (colored)

'T' handling rcp/scp sync; ok markus@

Revision 1.65 / (download) - annotate - [select for diffs], Fri Apr 6 16:46:59 2001 UTC (23 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.64: +5 -1 lines
Diff to previous 1.64 (colored)

remove trailing / from source paths; fixes pr#1756

Revision 1.64 / (download) - annotate - [select for diffs], Wed Mar 28 20:04:38 2001 UTC (23 years, 1 month ago) by stevesk
Branch: MAIN
Changes since 1.63: +3 -3 lines
Diff to previous 1.63 (colored)

usage more like rcp and add missing -B to usage; ok markus@

Revision 1.63 / (download) - annotate - [select for diffs], Wed Mar 28 19:56:23 2001 UTC (23 years, 1 month ago) by stevesk
Branch: MAIN
Changes since 1.62: +7 -11 lines
Diff to previous 1.62 (colored)

start to sync scp closer to rcp; ok markus@

Revision 1.43.2.3 / (download) - annotate - [select for diffs], Wed Mar 21 19:46:28 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.43.2.2: +5 -5 lines
Diff to previous 1.43.2.2 (colored) to branchpoint 1.43 (colored)

Pull in OpenSSH-2.5.2 for 2.8 branch.

Revision 1.30.2.4 / (download) - annotate - [select for diffs], Wed Mar 21 18:53:00 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.30.2.3: +5 -5 lines
Diff to previous 1.30.2.3 (colored) to branchpoint 1.30 (colored) next main 1.31 (colored)

Pull in OpenSSH-2.5.2 for 2.7 branch.

Revision 1.62 / (download) - annotate - [select for diffs], Wed Mar 21 12:33:33 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.61: +2 -2 lines
Diff to previous 1.61 (colored)

alpha fixes, from simonb@wasabisystems.com

Revision 1.61 / (download) - annotate - [select for diffs], Thu Mar 15 15:05:59 2001 UTC (23 years, 2 months ago) by markus
Branch: MAIN
Changes since 1.60: +3 -3 lines
Diff to previous 1.60 (colored)

use %lld in printf, ok millert@/deraadt@; report from ssh@client.fi

Revision 1.30.2.3 / (download) - annotate - [select for diffs], Mon Mar 12 15:44:13 2001 UTC (23 years, 2 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.30.2.2: +66 -70 lines
Diff to previous 1.30.2.2 (colored) to branchpoint 1.30 (colored)

OpenSSH-2.5.1 for 2.7 patch branch

Revision 1.60 / (download) - annotate - [select for diffs], Fri Mar 2 18:54:31 2001 UTC (23 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.59: +3 -3 lines
Diff to previous 1.59 (colored)

make copyright lines the same format

Revision 1.43.2.2 / (download) - annotate - [select for diffs], Mon Feb 19 17:19:17 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.43.2.1: +6 -6 lines
Diff to previous 1.43.2.1 (colored) to branchpoint 1.43 (colored)

Pull in OpenSSH-2.5.1

Revision 1.59 / (download) - annotate - [select for diffs], Mon Feb 19 10:36:25 2001 UTC (23 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.58: +6 -6 lines
Diff to previous 1.58 (colored)

np is changed by recursion; vinschen@redhat.com

Revision 1.43.2.1 / (download) - annotate - [select for diffs], Fri Feb 16 20:13:12 2001 UTC (23 years, 3 months ago) by jason
Branch: OPENBSD_2_8
Changes since 1.43: +63 -67 lines
Diff to previous 1.43 (colored)

Pull in OpenSSH 2.5.0

Revision 1.58 / (download) - annotate - [select for diffs], Sat Feb 10 15:14:11 2001 UTC (23 years, 3 months ago) by danh
Branch: MAIN
Changes since 1.57: +6 -2 lines
Diff to previous 1.57 (colored)

fix memory leak; ok markus@

Revision 1.57 / (download) - annotate - [select for diffs], Sat Feb 10 00:12:43 2001 UTC (23 years, 3 months ago) by danh
Branch: MAIN
Changes since 1.56: +1 -3 lines
Diff to previous 1.56 (colored)

revert a small change to allow -r option to work again; ok deraadt@

Revision 1.56 / (download) - annotate - [select for diffs], Thu Feb 8 19:30:52 2001 UTC (23 years, 3 months ago) by itojun
Branch: MAIN
Changes since 1.55: +4 -2 lines
Diff to previous 1.55 (colored)

sync with netbsd tree changes.
- more strict prototypes, include necessary headers
- use paths.h/pathnames.h decls
- size_t typecase to int -> u_long

Revision 1.55 / (download) - annotate - [select for diffs], Thu Feb 8 14:38:54 2001 UTC (23 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.54: +23 -16 lines
Diff to previous 1.54 (colored)

memory leak fix, and snprintf throughout

Revision 1.54 / (download) - annotate - [select for diffs], Wed Feb 7 18:01:17 2001 UTC (23 years, 3 months ago) by itojun
Branch: MAIN
Changes since 1.53: +2 -2 lines
Diff to previous 1.53 (colored)

unsigned long long -> %llu, not %qu.  markus ok

Revision 1.53 / (download) - annotate - [select for diffs], Sun Feb 4 23:56:22 2001 UTC (23 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.52: +3 -2 lines
Diff to previous 1.52 (colored)

alpha happiness

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

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

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

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

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

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

Revision 1.49 / (download) - annotate - [select for diffs], Sat Jan 13 18:03:07 2001 UTC (23 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.48: +2 -2 lines
Diff to previous 1.48 (colored)

getopt() returns -1 not EOF; stevesk@pobox.com

Revision 1.48 / (download) - annotate - [select for diffs], Mon Jan 1 14:52:49 2001 UTC (23 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.47: +1 -14 lines
Diff to previous 1.47 (colored)

use shared fatal(); from stevesk@pobox.com

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

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

Revision 1.46 / (download) - annotate - [select for diffs], Sat Dec 16 09:53:57 2000 UTC (23 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.45: +3 -2 lines
Diff to previous 1.45 (colored)

allow + in usernames; request from Florian.Weimer@RUS.Uni-Stuttgart.DE

Revision 1.45 / (download) - annotate - [select for diffs], Sat Dec 16 09:39:57 2000 UTC (23 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.44: +1 -4 lines
Diff to previous 1.44 (colored)

unused; from stevesk@pobox.com

Revision 1.44 / (download) - annotate - [select for diffs], Mon Dec 11 17:27:33 2000 UTC (23 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.43: +22 -23 lines
Diff to previous 1.43 (colored)

when copying 0-sized files, do not re-print ETA time at completion

Revision 1.30.2.2 / (download) - annotate - [select for diffs], Wed Nov 8 21:31:12 2000 UTC (23 years, 6 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.30.2.1: +113 -101 lines
Diff to previous 1.30.2.1 (colored) to branchpoint 1.30 (colored)

openssh-2.3.0 (again) for 2.7 branch

Revision 1.43 / (download) - annotate - [select for diffs], Wed Oct 18 18:23:02 2000 UTC (23 years, 7 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE
Branch point for: OPENBSD_2_8
Changes since 1.42: +5 -3 lines
Diff to previous 1.42 (colored)

replace atomicio(read,...) with read(); ok deraadt@

Revision 1.42 / (download) - annotate - [select for diffs], Sat Oct 14 10:07:21 2000 UTC (23 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.41: +5 -5 lines
Diff to previous 1.41 (colored)

remove spaces from arguments; from djm@mindrot.org

Revision 1.41 / (download) - annotate - [select for diffs], Wed Oct 11 20:03:27 2000 UTC (23 years, 7 months ago) by markus
Branch: MAIN
Changes since 1.40: +68 -87 lines
Diff to previous 1.40 (colored)

support 'scp -o' with help from mouring@pconline.com

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

utime() to utimes(); mouring@pconline.com

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

typo

Revision 1.38 / (download) - annotate - [select for diffs], Thu Sep 7 20:27:53 2000 UTC (23 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.37: +35 -7 lines
Diff to previous 1.37 (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.30.2.1 / (download) - annotate - [select for diffs], Fri Sep 1 18:23:22 2000 UTC (23 years, 8 months ago) by jason
Branch: OPENBSD_2_7
Changes since 1.30: +63 -91 lines
Diff to previous 1.30 (colored)

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

Revision 1.37 / (download) - annotate - [select for diffs], Fri Sep 1 15:25:13 2000 UTC (23 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.36: +2 -2 lines
Diff to previous 1.36 (colored)

cleanup and fix -S support; stevesk@sweden.hp.com

Revision 1.36 / (download) - annotate - [select for diffs], Thu Aug 24 21:46:59 2000 UTC (23 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.35: +3 -2 lines
Diff to previous 1.35 (colored)

off_t in sink, to fix files > 2GB, i think, test is still running ;-)

Revision 1.35 / (download) - annotate - [select for diffs], Sat Aug 19 02:50:07 2000 UTC (23 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.34: +32 -71 lines
Diff to previous 1.34 (colored)

knf

Revision 1.34 / (download) - annotate - [select for diffs], Sat Aug 19 02:26:08 2000 UTC (23 years, 9 months ago) by deraadt
Branch: MAIN
Changes since 1.33: +27 -19 lines
Diff to previous 1.33 (colored)

-S prog support; tv@debian.org

Revision 1.33 / (download) - annotate - [select for diffs], Thu Jul 13 23:19:31 2000 UTC (23 years, 10 months ago) by provos
Branch: MAIN
Changes since 1.32: +6 -3 lines
Diff to previous 1.32 (colored)

close can fail on AFS, report error; from Greg Hudson <ghudson@mit.edu>

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

OpenBSD tag

Revision 1.31 / (download) - annotate - [select for diffs], Sun Jun 18 03:16:09 2000 UTC (23 years, 11 months ago) by markus
Branch: MAIN
Changes since 1.30: +2 -3 lines
Diff to previous 1.30 (colored)

typo

Revision 1.30 / (download) - annotate - [select for diffs], Tue May 2 18:21:48 2000 UTC (24 years ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE
Branch point for: OPENBSD_2_7
Changes since 1.29: +10 -10 lines
Diff to previous 1.29 (colored)

more atomicio

Revision 1.29 / (download) - annotate - [select for diffs], Mon May 1 07:05:08 2000 UTC (24 years ago) by deraadt
Branch: MAIN
Changes since 1.28: +18 -18 lines
Diff to previous 1.28 (colored)

fix very rare EAGAIN/EINTR issues; based on work by djm

Revision 1.28 / (download) - annotate - [select for diffs], Sun Apr 16 04:47:43 2000 UTC (24 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.27: +10 -4 lines
Diff to previous 1.27 (colored)

after completion, replace the progress bar ETA counter with a final elapsed time; my idea, aaron wrote the patch

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

whitespace cleanup

Revision 1.26 / (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.25: +4 -4 lines
Diff to previous 1.25 (colored)

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

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

allow '.' in usernames; from jedgar@fxp.org

Revision 1.24 / (download) - annotate - [select for diffs], Tue Jan 4 16:57:16 2000 UTC (24 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 (colored)

document -4, -6, and 'ssh -L 2022/::1/22'

Revision 1.23 / (download) - annotate - [select for diffs], Tue Jan 4 00:07:59 2000 UTC (24 years, 4 months ago) by markus
Branch: MAIN
Changes since 1.22: +47 -7 lines
Diff to previous 1.22 (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.22 / (download) - annotate - [select for diffs], Mon Dec 6 20:15:28 1999 UTC (24 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.21: +2 -26 lines
Diff to previous 1.21 (colored)

move atomicio into it's own file.  wrap all socket write()s which were doing
write(sock, buf, len) != len, with atomicio() calls.

Revision 1.21 / (download) - annotate - [select for diffs], Wed Nov 24 20:26:35 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 (colored)

progress meter overflow fix from damien@ibs.com.au

Revision 1.20 / (download) - annotate - [select for diffs], Wed Nov 24 19:53:50 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.19: +11 -7 lines
Diff to previous 1.19 (colored)

KNF, final part 3

Revision 1.19 / (download) - annotate - [select for diffs], Wed Nov 24 00:26:03 1999 UTC (24 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.18: +11 -11 lines
Diff to previous 1.18 (colored)

much more KNF

Revision 1.18 / (download) - annotate - [select for diffs], Tue Nov 23 22:25:54 1999 UTC (24 years, 5 months ago) by markus
Branch: MAIN
Changes since 1.17: +306 -317 lines
Diff to previous 1.17 (colored)

KNF part 1

Revision 1.17 / (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.16: +14 -14 lines
Diff to previous 1.16 (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.16 / (download) - annotate - [select for diffs], Wed Nov 17 09:20:17 1999 UTC (24 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.15: +21 -5 lines
Diff to previous 1.15 (colored)

foregroundproc() in scp

Revision 1.15 / (download) - annotate - [select for diffs], Fri Nov 12 17:10:51 1999 UTC (24 years, 6 months ago) by markus
Branch: MAIN
Changes since 1.14: +4 -4 lines
Diff to previous 1.14 (colored)

fix overflow reported by damien@ibs.com.au: off_t totalsize, ok niels,aaron

Revision 1.14 / (download) - annotate - [select for diffs], Wed Oct 27 02:14:38 1999 UTC (24 years, 6 months ago) by aaron
Branch: MAIN
Changes since 1.13: +4 -4 lines
Diff to previous 1.13 (colored)

Calculation fix in progressmeter() for ETA > 1hr; pasto on my part.

Revision 1.13 / (download) - annotate - [select for diffs], Fri Oct 8 01:25:20 1999 UTC (24 years, 7 months ago) by aaron
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.12: +11 -8 lines
Diff to previous 1.12 (colored)

Print out the progress meter for 0 length files, too; deraadt@

Revision 1.12 / (download) - annotate - [select for diffs], Tue Oct 5 12:17:05 1999 UTC (24 years, 7 months ago) by aaron
Branch: MAIN
Changes since 1.11: +11 -7 lines
Diff to previous 1.11 (colored)

- Fix the progress meter for receiving files, too.
- Add a check for totalbytes <= 0 in progressmeter(), so we don't / 0.
- Reset statbytes when we issue progressmeter(1), just to be safe.

Revision 1.11 / (download) - annotate - [select for diffs], Tue Oct 5 10:58:37 1999 UTC (24 years, 7 months ago) by aaron
Branch: MAIN
Changes since 1.10: +25 -10 lines
Diff to previous 1.10 (colored)

Show filenames in the progress meter while transferring.

Revision 1.10 / (download) - annotate - [select for diffs], Mon Oct 4 01:59:56 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.9: +38 -14 lines
Diff to previous 1.9 (colored)

it is incredible what some people try to do in signal handlers

Revision 1.9 / (download) - annotate - [select for diffs], Sun Oct 3 20:43:12 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.8: +6 -3 lines
Diff to previous 1.8 (colored)

errno trashing considered harmfull

Revision 1.8 / (download) - annotate - [select for diffs], Sat Oct 2 19:18:22 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.7: +12 -7 lines
Diff to previous 1.7 (colored)

Wall

Revision 1.7 / (download) - annotate - [select for diffs], Sat Oct 2 18:33:56 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.6: +14 -3 lines
Diff to previous 1.6 (colored)

isatty() fixes for the progress meter; markus.friedl@informatik.uni-erlangen.de

Revision 1.6 / (download) - annotate - [select for diffs], Thu Sep 30 21:25:03 1999 UTC (24 years, 7 months ago) by aaron
Branch: MAIN
Changes since 1.5: +16 -8 lines
Diff to previous 1.5 (colored)

- Add -q option to shutup the progressmeter; markus friedl
- Describe -q in man page (needs conversion to mdoc still).
- Cleanup usage string.
- Correct a typo; espie@

Revision 1.5 / (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.4: +3 -35 lines
Diff to previous 1.4 (colored)

do not bother with dinosaur pacification

Revision 1.4 / (download) - annotate - [select for diffs], Thu Sep 30 01:21:41 1999 UTC (24 years, 7 months ago) by aaron
Branch: MAIN
Changes since 1.3: +133 -3 lines
Diff to previous 1.3 (colored)

Put our ftp(1) progress meter into scp(1).

Revision 1.3 / (download) - annotate - [select for diffs], Wed Sep 29 21:15:54 1999 UTC (24 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.2: +4 -8 lines
Diff to previous 1.2 (colored)

we have setsid

Revision 1.2 / (download) - annotate - [select for diffs], Wed Sep 29 18:16:20 1999 UTC (24 years, 7 months ago) by dugsong
Branch: MAIN
Changes since 1.1: +3 -21 lines
Diff to previous 1.1 (colored)

update krb4/AFS support to ssh-1.2.27-afs-kerberos-pl1 level, clean up unused variables, update manpages

Revision 1.1 / (download) - annotate - [select for diffs], Sun Sep 26 20:53:37 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: