diff options
-rw-r--r-- | ChangeLog | 398 | ||||
-rw-r--r-- | atomicio.c | 4 | ||||
-rw-r--r-- | auth-krb4.c | 25 | ||||
-rw-r--r-- | auth-options.c | 17 | ||||
-rw-r--r-- | auth-options.h | 12 | ||||
-rw-r--r-- | auth-passwd.c | 56 | ||||
-rw-r--r-- | auth-rh-rsa.c | 14 | ||||
-rw-r--r-- | auth-rhosts.c | 14 | ||||
-rw-r--r-- | auth-rsa.c | 14 | ||||
-rw-r--r-- | auth-skey.c | 28 | ||||
-rw-r--r-- | auth.c | 31 | ||||
-rw-r--r-- | auth.h | 23 | ||||
-rw-r--r-- | auth1.c | 8 | ||||
-rw-r--r-- | auth2.c | 8 | ||||
-rw-r--r-- | authfd.c | 36 | ||||
-rw-r--r-- | authfd.h | 14 | ||||
-rw-r--r-- | authfile.c | 92 | ||||
-rw-r--r-- | authfile.h | 17 | ||||
-rw-r--r-- | bufaux.c | 36 | ||||
-rw-r--r-- | bufaux.h | 13 | ||||
-rw-r--r-- | buffer.c | 14 | ||||
-rw-r--r-- | buffer.h | 14 | ||||
-rw-r--r-- | canohost.c | 14 | ||||
-rw-r--r-- | channels.c | 47 | ||||
-rw-r--r-- | channels.h | 45 | ||||
-rw-r--r-- | cipher.c | 37 | ||||
-rw-r--r-- | cipher.h | 13 | ||||
-rw-r--r-- | clientloop.c | 64 | ||||
-rw-r--r-- | compat.c | 9 | ||||
-rw-r--r-- | compat.h | 7 | ||||
-rw-r--r-- | compress.c | 14 | ||||
-rw-r--r-- | compress.h | 14 | ||||
-rw-r--r-- | crc32.c | 83 | ||||
-rw-r--r-- | crc32.h | 14 | ||||
-rw-r--r-- | deattack.c | 3 | ||||
-rw-r--r-- | dispatch.c | 7 | ||||
-rw-r--r-- | dispatch.h | 23 | ||||
-rw-r--r-- | dsa.c | 7 | ||||
-rw-r--r-- | dsa.h | 23 | ||||
-rw-r--r-- | getput.h | 14 | ||||
-rw-r--r-- | hmac.c | 7 | ||||
-rw-r--r-- | hmac.h | 23 | ||||
-rw-r--r-- | hostfile.c | 36 | ||||
-rw-r--r-- | hostfile.h | 11 | ||||
-rw-r--r-- | includes.h | 12 | ||||
-rw-r--r-- | kex.c | 7 | ||||
-rw-r--r-- | kex.h | 5 | ||||
-rw-r--r-- | key.c | 21 | ||||
-rw-r--r-- | key.h | 23 | ||||
-rw-r--r-- | log-client.c | 43 | ||||
-rw-r--r-- | log-server.c | 53 | ||||
-rw-r--r-- | log.c | 59 | ||||
-rw-r--r-- | login.c | 37 | ||||
-rw-r--r-- | match.c | 14 | ||||
-rw-r--r-- | match.h | 13 | ||||
-rw-r--r-- | mpaux.c | 16 | ||||
-rw-r--r-- | mpaux.h | 15 | ||||
-rw-r--r-- | myproposal.h | 23 | ||||
-rw-r--r-- | nchan.c | 7 | ||||
-rw-r--r-- | nchan.h | 7 | ||||
-rw-r--r-- | nchan.ms | 5 | ||||
-rw-r--r-- | packet.c | 36 | ||||
-rw-r--r-- | packet.h | 14 | ||||
-rw-r--r-- | pty.c | 14 | ||||
-rw-r--r-- | pty.h | 15 | ||||
-rw-r--r-- | radix.c | 24 | ||||
-rw-r--r-- | readconf.c | 14 | ||||
-rw-r--r-- | readconf.h | 14 | ||||
-rw-r--r-- | rsa.c | 49 | ||||
-rw-r--r-- | rsa.h | 16 | ||||
-rw-r--r-- | scp.c | 42 | ||||
-rw-r--r-- | servconf.c | 14 | ||||
-rw-r--r-- | servconf.h | 14 | ||||
-rw-r--r-- | serverloop.c | 36 | ||||
-rw-r--r-- | session.c | 38 | ||||
-rw-r--r-- | session.h | 23 | ||||
-rw-r--r-- | sftp-server.8 | 25 | ||||
-rw-r--r-- | sftp-server.c | 36 | ||||
-rw-r--r-- | ssh-add.1 | 38 | ||||
-rw-r--r-- | ssh-add.c | 37 | ||||
-rw-r--r-- | ssh-agent.1 | 42 | ||||
-rw-r--r-- | ssh-agent.c | 38 | ||||
-rw-r--r-- | ssh-keygen.1 | 38 | ||||
-rw-r--r-- | ssh-keygen.c | 9 | ||||
-rw-r--r-- | ssh.1 | 38 | ||||
-rw-r--r-- | ssh.c | 61 | ||||
-rw-r--r-- | ssh.h | 19 | ||||
-rw-r--r-- | ssh2.h | 26 | ||||
-rw-r--r-- | sshconnect.c | 9 | ||||
-rw-r--r-- | sshconnect.h | 23 | ||||
-rw-r--r-- | sshconnect1.c | 8 | ||||
-rw-r--r-- | sshconnect2.c | 7 | ||||
-rw-r--r-- | sshd.8 | 38 | ||||
-rw-r--r-- | sshd.c | 61 | ||||
-rw-r--r-- | tildexpand.c | 9 | ||||
-rw-r--r-- | ttymodes.c | 9 | ||||
-rw-r--r-- | ttymodes.h | 13 | ||||
-rw-r--r-- | uidswap.c | 9 | ||||
-rw-r--r-- | uidswap.h | 12 | ||||
-rw-r--r-- | util.c | 28 | ||||
-rw-r--r-- | uuencode.c | 25 | ||||
-rw-r--r-- | uuencode.h | 24 | ||||
-rw-r--r-- | xmalloc.c | 9 | ||||
-rw-r--r-- | xmalloc.h | 12 |
104 files changed, 2040 insertions, 789 deletions
@@ -1,3 +1,51 @@ +20000916 + - (djm) Merge OpenBSD changes: + - markus@cvs.openbsd.org 2000/09/05 02:59:57 + [session.c] + print hostname (not hushlogin) + - markus@cvs.openbsd.org 2000/09/05 13:18:48 + [authfile.c ssh-add.c] + enable ssh-add -d for DSA keys + - markus@cvs.openbsd.org 2000/09/05 13:20:49 + [sftp-server.c] + cleanup + - markus@cvs.openbsd.org 2000/09/06 03:46:41 + [authfile.h] + prototype + - deraadt@cvs.openbsd.org 2000/09/07 14:27:56 + [ALL] + 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. + - markus@cvs.openbsd.org 2000/09/07 14:40:30 + [channels.c channels.h clientloop.c serverloop.c ssh.c] + cleanup window and packet sizes for ssh2 flow control; ok niels + - markus@cvs.openbsd.org 2000/09/07 14:53:00 + [scp.c] + typo + - markus@cvs.openbsd.org 2000/09/07 15:13:37 + [auth-options.c auth-options.h auth-rh-rsa.c auth-rsa.c auth.c] + [authfile.h canohost.c channels.h compat.c hostfile.h log.c match.h] + [pty.c readconf.c] + some more Copyright fixes + - markus@cvs.openbsd.org 2000/09/08 03:02:51 + [README.openssh2] + bye bye + - deraadt@cvs.openbsd.org 2000/09/11 18:38:33 + [LICENCE cipher.c] + a few more comments about it being ARC4 not RC4 + - markus@cvs.openbsd.org 2000/09/12 14:53:11 + [log-client.c log-server.c log.c ssh.1 ssh.c ssh.h sshd.8 sshd.c] + multiple debug levels + - markus@cvs.openbsd.org 2000/09/14 14:25:15 + [clientloop.c] + typo + - deraadt@cvs.openbsd.org 2000/09/15 01:13:51 + [ssh-agent.c] + check return value for setenv(3) for failure, and deal appropriately + 20000913 - (djm) Fix server not exiting with jobs in background. @@ -51,7 +99,7 @@ - (djm) Release 2.2.0p1 20000831 - - (djm) Workaround SIGPIPE problems on SCO. Fix from Aran Cox + - (djm) Workaround SIGPIPE problems on SCO. Fix from Aran Cox <acox@cv.telegroup.com> - (djm) Pick up new version (2.2.0) from OpenBSD CVS @@ -59,7 +107,7 @@ - (djm) Compile warning fixes from Mark Miller <markm@swoon.net> - (djm) Periodically rekey arc4random - (djm) Clean up diff against OpenBSD. - - (djm) HPUX 11 needs USE_PIPES as well: Kevin Steves + - (djm) HPUX 11 needs USE_PIPES as well: Kevin Steves <stevesk@sweden.hp.com> - (djm) Quieten the pam delete credentials error message - (djm) Fix printing of $DISPLAY hack if set by system type. Report from @@ -68,8 +116,8 @@ - (djm) Fix doh in bsd-arc4random.c 20000829 - - (djm) Fix ^C ignored issue on Solaris. Diagnosis from Gert - Doering <gert@greenie.muc.de>, John Horne <J.Horne@plymouth.ac.uk> and + - (djm) Fix ^C ignored issue on Solaris. Diagnosis from Gert + Doering <gert@greenie.muc.de>, John Horne <J.Horne@plymouth.ac.uk> and Garrick James <garrick@james.net> - (djm) Check for SCO pty naming style (ptyp%d/ttyp%d). Based on fix from Bastian Trompetter <btrompetter@firemail.de> @@ -108,8 +156,8 @@ 20000823 - (djm) Define USE_PIPES to avoid socketpair problems on HPUX 10 and SunOS 4 - Avoids "scp never exits" problem. Reports from Lutz Jaenicke - <Lutz.Jaenicke@aet.TU-Cottbus.DE> and Tamito KAJIYAMA + Avoids "scp never exits" problem. Reports from Lutz Jaenicke + <Lutz.Jaenicke@aet.TU-Cottbus.DE> and Tamito KAJIYAMA <kajiyama@grad.sccs.chukyo-u.ac.jp> - (djm) Pick up LOGIN_PROGRAM from environment or PATH if not set by headers - (djm) Add local version to version.h @@ -139,8 +187,8 @@ [crc32.h] proper prototype - markus@cvs.openbsd.org 2000/08/19 15:34:44 - [authfd.c authfd.h key.c key.h ssh-add.1 ssh-add.c ssh-agent.1] - [ssh-agent.c ssh-keygen.c sshconnect1.c sshconnect2.c Makefile] + [authfd.c authfd.h key.c key.h ssh-add.1 ssh-add.c ssh-agent.1] + [ssh-agent.c ssh-keygen.c sshconnect1.c sshconnect2.c Makefile] [fingerprint.c fingerprint.h] add SSH2/DSA support to the agent and some other DSA related cleanups. (note that we cannot talk to ssh.com's ssh2 agents) @@ -214,9 +262,9 @@ 20000816 - (djm) Replacement for inet_ntoa for Irix (which breaks on gcc) - - (djm) Fix strerror replacement for old SunOS. Based on patch from + - (djm) Fix strerror replacement for old SunOS. Based on patch from Charles Levert <charles@comm.polymtl.ca> - - (djm) Seperate arc4random into seperate file and use OpenSSL's RC4 + - (djm) Seperate arc4random into seperate file and use OpenSSL's RC4 implementation. - (djm) SUN_LEN macro for systems which lack it @@ -225,7 +273,7 @@ - (djm) Avoid failures on Irix when ssh is not setuid. Fix from Michael Stone <mstone@cs.loyola.edu> - (djm) Don't seek in directory based lastlogs - - (djm) Fix --with-ipaddr-display configure option test. Patch from + - (djm) Fix --with-ipaddr-display configure option test. Patch from Jarno Huuskonen <jhuuskon@messi.uku.fi> - (djm) Fix AIX limits from Alexandre Oliva <oliva@lsd.ic.unicamp.br> @@ -234,9 +282,9 @@ Fabrice bacchella <fabrice.bacchella@marchfirst.fr> 20000809 - - (djm) Define AIX hard limits if headers don't. Report from + - (djm) Define AIX hard limits if headers don't. Report from Bill Painter <william.t.painter@lmco.com> - - (djm) utmp direct write & SunOS 4 patch from Charles Levert + - (djm) utmp direct write & SunOS 4 patch from Charles Levert <charles@comm.polymtl.ca> 20000808 @@ -315,9 +363,9 @@ - (djm) Fixup for AIX getuserattr() support from Tom Bertelson <tbert@abac.com> - (djm) ReliantUNIX support from Udo Schweigert <ust@cert.siemens.de> - - (djm) NeXT: dirent structures to get scp working from Ben Lindstrom + - (djm) NeXT: dirent structures to get scp working from Ben Lindstrom <mouring@pconline.com> - - (djm) Fix broken inet_ntoa check and ut_user/ut_name confusion, report + - (djm) Fix broken inet_ntoa check and ut_user/ut_name confusion, report from Jim Watt <jimw@peisj.pebio.com> - (djm) Replaced bsd-snprintf.c with one from Mutt source tree, it is known to compile on more platforms (incl NeXT). @@ -329,7 +377,7 @@ cleanup, less cut&paste - markus@cvs.openbsd.org 2000/06/26 15:59:19 [servconf.c servconf.h session.c sshd.8 sshd.c] - MaxStartups: limit number of unauthenticated connections, work by + MaxStartups: limit number of unauthenticated connections, work by theo and me - deraadt@cvs.openbsd.org 2000/07/05 14:18:07 [session.c] @@ -339,7 +387,7 @@ typo - aaron@cvs.openbsd.org 2000/07/05 22:06:58 [scp.1 ssh-agent.1 ssh-keygen.1 sshd.8] - Insert more missing .El directives. Our troff really should identify + Insert more missing .El directives. Our troff really should identify these and spit out a warning. - todd@cvs.openbsd.org 2000/07/06 21:55:04 [auth-rsa.c auth2.c ssh-keygen.c] @@ -372,7 +420,7 @@ Kevin Steves <stevesk@sweden.hp.com> - (djm) Match prototype and function declaration for rresvport_af. Problem report from Niklas Edmundsson <nikke@ing.umu.se> - - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM + - (djm) Missing $(DESTDIR) on host-key target causing problems with RPM builds. Problem report from Gregory Leblanc <GLeblanc@cu-portland.edu> - (djm) Replace ut_name with ut_user. Patch from Jim Watt <jimw@peisj.pebio.com> @@ -382,19 +430,19 @@ uids. Based on problem report from Jim Watt <jimw@peisj.pebio.com> - (djm) More NeXT compatibility from Ben Lindstrom <mouring@pconline.com> Including sigaction() et al. replacements - - (djm) AIX getuserattr() session initialisation from Tom Bertelson + - (djm) AIX getuserattr() session initialisation from Tom Bertelson <tbert@abac.com> 20000708 - - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from + - (djm) Fix bad fprintf format handling in auth-pam.c. Patch from Aaron Hopkins <aaron@die.net> - (djm) Fix incorrect configure handling of --with-rsh-path option. Fix from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> - - (djm) Fixed undefined variables for OSF SIA. Report from + - (djm) Fixed undefined variables for OSF SIA. Report from Baars, Henk <Hendrik.Baars@nl.origin-it.com> - - (djm) Handle EWOULDBLOCK returns from read() and write() in atomicio.c + - (djm) Handle EWOULDBLOCK returns from read() and write() in atomicio.c Fix from Marquess, Steve Mr JMLFDC <Steve.Marquess@DET.AMEDD.ARMY.MIL> - - (djm) Don't use inet_addr. + - (djm) Don't use inet_addr. 20000702 - (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com> @@ -402,7 +450,7 @@ on fix from HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp> - (djm) Use standard OpenSSL functions in auth-skey.c. Patch from Chris, the Young One <cky@pobox.com> - - (djm) Fix scp progress meter on really wide terminals. Based on patch + - (djm) Fix scp progress meter on really wide terminals. Based on patch from James H. Cloos Jr. <cloos@jhcloos.com> 20000701 @@ -421,9 +469,9 @@ - (djm) Patch from Michael Stone <mstone@cs.loyola.edu> to add support for Irix 6.x array sessions, project id's, and system audit trail id. - (djm) Added 'distprep' make target to simplify packaging - - (djm) Added patch from Chris Adams <cmadams@hiwaay.net> to add OSF SIA + - (djm) Added patch from Chris Adams <cmadams@hiwaay.net> to add OSF SIA support. Enable using "USE_SIA=1 ./configure [options]" - + 20000627 - (djm) Fixes to login code - not setting li->uid, cleanups - (djm) Formatting @@ -441,7 +489,7 @@ correct check for bad channel ids; from Wei Dai <weidai@eskimo.com> 20000623 - - (djm) Use sa_family_t in prototype for rresvport_af. Patch from + - (djm) Use sa_family_t in prototype for rresvport_af. Patch from Svante Signell <svante.signell@telia.com> - (djm) Autoconf logic to define sa_family_t if it is missing - OpenBSD CVS Updates: @@ -469,11 +517,11 @@ - markus@cvs.openbsd.org 2000/06/19 19:39:45 [atomicio.c auth-options.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c] [auth-rsa.c auth-skey.c authfd.c authfd.h authfile.c bufaux.c bufaux.h] - [buffer.c buffer.h canohost.c channels.c channels.h cipher.c cipher.h] + [buffer.c buffer.h canohost.c channels.c channels.h cipher.c cipher.h] [clientloop.c compat.c compat.h compress.c compress.h crc32.c crc32.h] [deattack.c dispatch.c dsa.c fingerprint.c fingerprint.h getput.h hmac.c] - [kex.c log-client.c log-server.c login.c match.c mpaux.c mpaux.h nchan.c] - [nchan.h packet.c packet.h pty.c pty.h readconf.c readconf.h readpass.c] + [kex.c log-client.c log-server.c login.c match.c mpaux.c mpaux.h nchan.c] + [nchan.h packet.c packet.h pty.c pty.h readconf.c readconf.h readpass.c] [rsa.c rsa.h scp.c servconf.c servconf.h ssh-add.c ssh-keygen.c ssh.c] [ssh.h tildexpand.c ttymodes.c ttymodes.h uidswap.c xmalloc.c xmalloc.h] OpenBSD tag @@ -482,17 +530,17 @@ 20000620 - (djm) Replace use of '-o' and '-a' logical operators in configure tests - with '||' and '&&'. As suggested by Jim Knoble <jmknoble@pint-stowp.cx> + with '||' and '&&'. As suggested by Jim Knoble <jmknoble@pint-stowp.cx> to fix SCO Unixware problem reported by Gary E. Miller <gem@rellim.com> - (djm) Typo in loginrec.c 20000618 - (djm) Add summary of configure options to end of ./configure run |