RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-24 19:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,770 Commits 69 Branches 157 Tags 27 MiB
525a0b090f
Commit Graph

155 Commits

Author SHA1 Message Date
Damien Miller
7a656f7922 - djm@cvs.openbsd.org 2006/04/01 05:50:29 
[scp.c]
     xasprintification; ok deraadt@
 2006-04-23 12:04:46 +10:00
Damien Miller
07aa132a5e - (djm) OpenBSD CVS Sync 
- deraadt@cvs.openbsd.org 2006/04/01 05:42:20
     [scp.c]
     minimal lint cleanup (unused crud, and some size_t); ok djm
 2006-04-23 12:04:27 +10:00
Damien Miller
57c30117c1 - djm@cvs.openbsd.org 2006/03/25 13:17:03 
[atomicio.c auth-bsdauth.c auth-chall.c auth-options.c auth-passwd.c]
     [auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth-skey.c auth.c auth1.c]
     [auth2-chall.c auth2-hostbased.c auth2-kbdint.c auth2-none.c]
     [auth2-passwd.c auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c]
     [buffer.c canohost.c channels.c cipher-3des1.c cipher-bf1.c]
     [cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c compress.c]
     [deattack.c dh.c dispatch.c fatal.c groupaccess.c hostfile.c kex.c]
     [kexdh.c kexdhc.c kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c]
     [mac.c match.c md-sha256.c misc.c monitor.c monitor_fdpass.c]
     [monitor_mm.c monitor_wrap.c msg.c nchan.c packet.c progressmeter.c]
     [readconf.c readpass.c rsa.c scard.c scp.c servconf.c serverloop.c]
     [session.c sftp-client.c sftp-common.c sftp-glob.c sftp-server.c]
     [sftp.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c]
     [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c]
     [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c]
     [uidswap.c uuencode.c xmalloc.c]
     Put $OpenBSD$ tags back (as comments) to replace the RCSID()s that
     Theo nuked - our scripts to sync -portable need them in the files
 2006-03-26 14:24:48 +11:00
Damien Miller
36812092ec - djm@cvs.openbsd.org 2006/03/25 01:13:23 
[buffer.c channels.c deattack.c misc.c scp.c session.c sftp-client.c]
     [sftp-server.c ssh-agent.c ssh-rsa.c xmalloc.c xmalloc.h auth-pam.c]
     [uidswap.c]
     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@
 2006-03-26 14:22:47 +11:00
Damien Miller
745570cd79 - biorn@cvs.openbsd.org 2006/03/16 10:31:45 
[scp.c]
     Try to display errormessage even if remout == -1
     ok djm@, markus@
 2006-03-26 13:49:43 +11:00
Damien Miller
b0fb6872ed - deraadt@cvs.openbsd.org 2006/03/19 18:51:18 
[atomicio.c auth-bsdauth.c auth-chall.c auth-krb5.c auth-options.c]
     [auth-pam.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c]
     [auth-shadow.c auth-skey.c auth.c auth1.c auth2-chall.c]
     [auth2-hostbased.c auth2-kbdint.c auth2-none.c auth2-passwd.c]
     [auth2-pubkey.c auth2.c authfd.c authfile.c bufaux.c buffer.c]
     [canohost.c channels.c cipher-3des1.c cipher-acss.c cipher-aes.c]
     [cipher-bf1.c cipher-ctr.c cipher.c cleanup.c clientloop.c compat.c]
     [compress.c deattack.c dh.c dispatch.c dns.c entropy.c fatal.c]
     [groupaccess.c hostfile.c includes.h kex.c kexdh.c kexdhc.c]
     [kexdhs.c kexgex.c kexgexc.c kexgexs.c key.c log.c loginrec.c]
     [loginrec.h logintest.c mac.c match.c md-sha256.c md5crypt.c misc.c]
     [monitor.c monitor_fdpass.c monitor_mm.c monitor_wrap.c msg.c]
     [nchan.c packet.c progressmeter.c readconf.c readpass.c rsa.c]
     [scard.c scp.c servconf.c serverloop.c session.c sftp-client.c]
     [sftp-common.c sftp-glob.c sftp-server.c sftp.c ssh-add.c]
     [ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c]
     [ssh-rand-helper.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c]
     [sshconnect2.c sshd.c sshlogin.c sshpty.c sshtty.c ttymodes.c]
     [uidswap.c uuencode.c xmalloc.c openbsd-compat/bsd-arc4random.c]
     [openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-cygwin_util.c]
     [openbsd-compat/bsd-getpeereid.c openbsd-compat/bsd-misc.c]
     [openbsd-compat/bsd-nextstep.c openbsd-compat/bsd-snprintf.c]
     [openbsd-compat/bsd-waitpid.c openbsd-compat/fake-rfc2553.c]
     RCSID() can die
 2006-03-26 00:03:21 +11:00
Damien Miller
c7b06369a8 - stevesk@cvs.openbsd.org 2006/02/22 00:04:45 
[canohost.c clientloop.c includes.h match.c readconf.c scp.c ssh.c]
     [sshconnect.c]
     move #include <ctype.h> out of includes.h; ok djm@
 2006-03-15 11:53:45 +11:00
Damien Miller
6ff3caddb6 oops, this commit is really: 
- stevesk@cvs.openbsd.org 2006/02/20 17:02:44
     [clientloop.c includes.h monitor.c progressmeter.c scp.c]
     [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c]
     move #include <signal.h> out of includes.h; ok markus@

the previous was:

   - stevesk@cvs.openbsd.org 2006/02/20 17:19:54
     [auth-rhosts.c auth-rsa.c auth.c auth2-none.c auth2-pubkey.c]
     [authfile.c clientloop.c includes.h readconf.c scp.c session.c]
     [sftp-client.c sftp-common.c sftp-common.h sftp-glob.c]
     [sftp-server.c sftp.c ssh-add.c ssh-keygen.c ssh.c sshconnect.c]
     [sshconnect2.c sshd.c sshpty.c]
     move #include <sys/stat.h> out of includes.h; ok markus@
 2006-03-15 11:52:09 +11:00
Damien Miller
f17883e6a0 - stevesk@cvs.openbsd.org 2006/02/20 17:02:44 
[clientloop.c includes.h monitor.c progressmeter.c scp.c]
     [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c]
     move #include <signal.h> out of includes.h; ok markus@
 2006-03-15 11:45:54 +11:00
Damien Miller
9cf6d077fb - stevesk@cvs.openbsd.org 2006/02/10 01:44:27 
[includes.h monitor.c readpass.c scp.c serverloop.c session.c^?]
     [sftp.c sshconnect.c sshconnect2.c sshd.c]
     move #include <sys/wait.h> out of includes.h; ok markus@
 2006-03-15 11:29:24 +11:00
Damien Miller
88f254b9a5 - stevesk@cvs.openbsd.org 2006/02/08 23:51:24 
[includes.h scp.c sftp-glob.c sftp-server.c]
     move #include <dirent.h> out of includes.h; ok markus@
 2006-03-15 11:25:13 +11:00
Damien Miller
923f1ce0b7 - djm@cvs.openbsd.org 2006/01/31 10:35:43 
[scp.c]
     "scp a b c" shouldn't clobber "c" when it is not a directory, report and
     fix from biorn@; ok markus@
 2006-01-31 22:11:37 +11:00
Damien Miller
3eec6b73a2 - djm@cvs.openbsd.org 2006/01/31 10:19:02 
[misc.c misc.h scp.c sftp.c]
     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@
 2006-01-31 21:49:27 +11:00
Damien Miller
d27b947178 - reyk@cvs.openbsd.org 2005/12/06 22:38:28 
[auth-options.c auth-options.h channels.c channels.h clientloop.c]
     [misc.c misc.h readconf.c readconf.h scp.c servconf.c servconf.h]
     [serverloop.c sftp.c ssh.1 ssh.c ssh_config ssh_config.5 sshconnect.c]
     [sshconnect.h sshd.8 sshd_config sshd_config.5]
     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
 2005-12-13 19:29:02 +11:00
Darren Tucker
e0be30426a - (dtucker) [progressmeter.c scp.c sftp-server.c] Use correct casts for 
snprintf formats, fixes warnings on some 64 bit platforms.  Patch from
   shaw at vranix.com, ok djm@
 2005-11-25 14:44:55 +11:00
Darren Tucker
33f86bc284 - deraadt@cvs.openbsd.org 2005/11/12 18:38:15 
[scp.c]
     avoid close(-1), as in rcp; ok cloder
 2005-11-22 19:38:06 +11:00
Darren Tucker
ce321d8a30 - djm@cvs.openbsd.org 2005/09/13 23:40:07 
[sshd.c ssh.c misc.h sftp.c ssh-keygen.c ssh-keysign.c sftp-server.c
     scp.c misc.c ssh-keyscan.c ssh-add.c ssh-agent.c]
     ensure that stdio fds are attached; ok deraadt@
 2005-10-03 18:11:24 +10:00
Darren Tucker
4085853915 - dtucker@cvs.openbsd.org 2005/07/27 10:39:03 
[scp.c hostfile.c sftp-client.c]
     Silence bogus -Wuninitialized warnings; ok djm@
 2005-08-02 17:07:07 +10:00
Damien Miller
eccb9de72a - djm@cvs.openbsd.org 2005/06/17 02:44:33 
[auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c]
     [bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c]
     [kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c]
     [servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c]
     [ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c]
     make this -Wsign-compare clean; ok avsm@ markus@
     NB. auth1.c changes not committed yet (conflicts with uncommitted sync)
     NB2. more work may be needed to make portable Wsign-compare clean
 2005-06-17 12:59:34 +10:00
Darren Tucker
fc4f2dd347 - avsm@cvs.openbsd.org 2005/05/26 02:08:05 
[scp.c]
     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
 2005-06-01 23:01:12 +10:00
Damien Miller
b253cc4213 - avsm@cvs.openbsd.org 2005/05/24 17:32:44 
[atomicio.c atomicio.h authfd.c monitor_wrap.c msg.c scp.c sftp-client.c]
     [ssh-keyscan.c sshconnect.c]
     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@
 2005-05-26 12:23:44 +10:00
Damien Miller
4942de5719 - djm@cvs.openbsd.org 2005/04/02 12:41:16 
[scp.c]
     since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror
     build
 2005-04-03 10:16:39 +10:00
Damien Miller
3dae15c611 - deraadt@cvs.openbsd.org 2005/03/31 18:39:21 
[scp.c]
     copy argv[] element instead of smashing the one that ps will see; ok otto
 2005-04-03 10:16:11 +10:00
Darren Tucker
ba66df81a3 - dtucker@cvs.openbsd.org 2005/01/24 10:22:06 
[scp.c sftp.c]
     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@
 2005-01-24 21:57:40 +11:00
Darren Tucker
f30e1acc62 - deraadt@cvs.openbsd.org 2004/09/15 18:46:04 
[scp.c]
     scratch that do { } while (0) wrapper in this case
 2004-11-05 20:10:02 +11:00
Darren Tucker
fe6649da0c - avsm@cvs.openbsd.org 2004/08/11 21:44:32 
[authfd.c scp.c ssh-keyscan.c]
     use atomicio instead of homegrown equivalents or read/write.
     markus@ ok
 2004-08-13 21:19:37 +10:00
Darren Tucker
ba6de952a0 - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c 
ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c
   openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c.  Reduces
   diff vs OpenBSD; ok mouring@, tested by tim@ too.
 2004-07-17 14:07:42 +10:00
Darren Tucker
e1f17055ed - dtucker@cvs.openbsd.org 2004/07/08 12:47:21 
[scp.c]
     Prevent scp from skipping the file following a double-error.
     bz #863, ok markus@
 2004-07-08 23:11:44 +10:00
Darren Tucker
3f9fdc7121 - avsm@cvs.openbsd.org 2004/06/21 17:36:31 
[auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c
     cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c
     monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c
     ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c
     sshpty.c]
     make ssh -Wshadow clean, no functional changes
     markus@ ok

There are also some portable-specific -Wshadow warnings to be fixed in
monitor.c and montior_wrap.c.
 2004-06-22 12:56:01 +10:00
Darren Tucker
bddc2b0179 - markus@cvs.openbsd.org 2004/04/01 12:19:57 
[scp.c]
     limit trust between local and remote rcp/scp process,
     noticed by lcamtuf; ok deraadt@, djm@
 2004-04-19 23:50:16 +10:00
Damien Miller
a4b33dfb6d - djm@cvs.openbsd.org 2003/11/23 23:18:45 
[ssh-keygen.c]
     consistency PATH_MAX -> MAXPATHLEN; ok markus@
     (RCS ID sync only)
   - djm@cvs.openbsd.org 2003/11/23 23:21:21
     [scp.c]
     from portable: rename clashing variable limit-> limit_rate; ok markus@
     (RCS ID sync only)
 2003-11-24 13:09:27 +11:00
Damien Miller
4da295c051 - (djm) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch 2003-11-22 14:39:04 +11:00
Damien Miller
787b2ec18c more whitespace (tabs this time) 2003-11-21 23:56:47 +11:00
Damien Miller
a8e06cef35 - djm@cvs.openbsd.org 2003/11/21 11:57:03 
[everything]
     unexpand and delete whitespace at EOL; ok markus@
     (done locally and RCS IDs synced)
 2003-11-21 23:48:55 +11:00
Damien Miller
c1f2792bd0 - dtucker@cvs.openbsd.org 2003/11/12 10:12:15 
[scp.c]
     When called with -q, pass -q to ssh; suppresses SSH2 banner.  ok markus@
 2003-11-17 21:19:05 +11:00
Darren Tucker
1f20394e92 - jmc@cvs.openbsd.org 2003/10/08 08:27:36 
[scp.1 scp.c sftp-server.8 sftp.1 sftp.c ssh.1 sshd.8]
     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@
 2003-10-15 15:50:42 +10:00
Darren Tucker
8654d16f0f - markus@cvs.openbsd.org 2003/09/19 17:40:20 
[scp.c]
     error handling for remote-remote copy; #638; report Harald Koenig;
     ok millert, fgs, henning, deraadt
 2003-09-22 21:14:55 +10:00
Damien Miller
59d3d5b8b4 - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal 
-lbroken; ok dtucker
 2003-08-22 09:34:41 +10:00
Darren Tucker
03a29baf35 - deraadt@cvs.openbsd.org 2003/07/18 01:54:25 
[scp.c]
     userid is unsigned, but well, force it anyways; andrushock@korovino.net
 2003-07-19 20:07:45 +10:00
Darren Tucker
9f63f22aa0 - deraadt@cvs.openbsd.org 2003/06/28 16:23:06 
[atomicio.c atomicio.h authfd.c clientloop.c monitor_wrap.c msg.c
     progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
     sshd.c]
     deal with typing of write vs read in atomicio
 2003-07-03 13:46:56 +10:00
Damien Miller
b2cdcb50a2 - nino@cvs.openbsd.org 2003/06/12 15:34:09 
[scp.c]
     Typo. Ok markus@.
 2003-06-18 20:26:34 +10:00
Damien Miller
b69aaa8db7 - djm@cvs.openbsd.org 2003/06/04 12:40:39 
[scp.c]
     kill ssh process upon receipt of signal, bz #241.
     based on patch from esb AT hawaii.edu; ok markus@
 2003-06-04 22:51:24 +10:00
Damien Miller
65d1f5765f - djm@cvs.openbsd.org 2003/06/04 12:18:49 
[scp.c]
     ansify; ok markus@
 2003-06-04 22:51:08 +10:00
Damien Miller
dafb12ed28 a - millert@cvs.openbsd.org 2003/06/03 02:56:16 
[scp.c]
     Remove the advertising clause in the UCB license which Berkeley
     rescinded 22 July 1999.  Proofed by myself and Theo.
 2003-06-03 13:06:18 +10:00
Ben Lindstrom
0e7f4363f3 - (bal) [defines.h progressmeter.c scp.c] Some more culling of non 64bit 
hacked code.
 2003-04-28 23:30:43 +00:00
Ben Lindstrom
d54d9382a4 - (bal) scp.c 'limit' conflicts with Cray. Rename to 'limitbw' 2003-03-21 00:55:32 +00:00
Damien Miller
0011138d47 - (djm) OpenBSD CVS Sync 
- markus@cvs.openbsd.org 2003/03/05 22:33:43
     [channels.c monitor.c scp.c session.c sftp-client.c sftp-int.c]
     [sftp-server.c ssh-add.c sshconnect2.c]
     fix memory leaks; from dlheine@suif.Stanford.EDU/CLOUSEAU; ok djm@
 2003-03-10 11:21:17 +11:00
Damien Miller
eeeeb3517e - markus@cvs.openbsd.org 2003/02/02 10:51:13 
[scp.c]
     call okname() only when using system(3) for remote-remote copy;
     fixes bugs #483, #472; ok deraadt@, mouring@
 2003-02-24 11:52:58 +11:00
Damien Miller
8e12147df5 - markus@cvs.openbsd.org 2003/01/23 14:06:15 
[scp.1 scp.c]
     scp -12; Sam Smith and others; ok provos@, deraadt@
 2003-01-24 11:37:38 +11:00
Damien Miller
ff74d748e9 - markus@cvs.openbsd.org 2003/01/23 14:01:53 
[scp.c]
     bandwidth limitation patch (scp -l) from niels@; ok todd@, deraadt@
 2003-01-24 11:36:58 +11:00