diff -ru openssh-3.2.2p1/ChangeLog openssh-3.2.3p1/ChangeLog --- openssh-3.2.2p1/ChangeLog 2002-05-16 07:50:14.000000000 +1000 +++ openssh-3.2.3p1/ChangeLog 2002-05-22 14:24:01.000000000 +1000 @@ -1,3 +1,21 @@ +20020522 + - (djm) Fix spelling mistakes, spotted by Solar Designer i + + - Sync scard/ (not sure when it drifted) + - (djm) OpenBSD CVS Sync: + [auth.c] + Fix typo/thinko. Pass in as to auth_approval(), not NULL. + Closes PR 2659. + - Crank version + - Crank RPM spec versions + +20020521 + - (stevesk) [sshd.c] bug 245; disable setsid() for now + - (stevesk) [sshd.c] #ifndef HAVE_CYGWIN for setgroups() + +20020517 + - (tim) [configure.ac] remove extra MD5_MSG="no" line. + 20020515 - (bal) CVS ID fix up on auth-passwd.c - (bal) OpenBSD CVS Sync @@ -653,4 +671,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2134 2002/05/15 21:50:14 mouring Exp $ +$Id: ChangeLog,v 1.2141 2002/05/22 04:24:01 djm Exp $ diff -ru openssh-3.2.2p1/README.privsep openssh-3.2.3p1/README.privsep --- openssh-3.2.2p1/README.privsep 2002-05-14 13:50:38.000000000 +1000 +++ openssh-3.2.3p1/README.privsep 2002-05-22 11:02:15.000000000 +1000 @@ -28,7 +28,7 @@ configure supports the following options to change the default privsep user and chroot directory: - --with-privsep-path=xxx Path for privilege seperation chroot + --with-privsep-path=xxx Path for privilege separation chroot --with-privsep-user=user Specify non-privileged user for privilege separation Privsep requires operating system support for file descriptor passing @@ -54,4 +54,4 @@ process 6917 is the privileged monitor process, 6919 is the user owned sshd process and 6921 is the shell process. -$Id: README.privsep,v 1.4 2002/05/14 03:50:38 tim Exp $ +$Id: README.privsep,v 1.5 2002/05/22 01:02:15 djm Exp $ diff -ru openssh-3.2.2p1/auth.c openssh-3.2.3p1/auth.c --- openssh-3.2.2p1/auth.c 2002-05-16 02:16:14.000000000 +1000 +++ openssh-3.2.3p1/auth.c 2002-05-22 15:06:43.000000000 +1000 @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth.c,v 1.42 2002/05/13 20:44:58 markus Exp $"); +RCSID("$OpenBSD: auth.c,v 1.43 2002/05/17 14:27:55 millert Exp $"); #ifdef HAVE_LOGIN_H #include @@ -485,7 +485,7 @@ } #ifdef BSD_AUTH if ((as = auth_open()) == NULL || auth_setpwd(as, pw) != 0 || - auth_approval(NULL, lc, pw->pw_name, "ssh") <= 0) { + auth_approval(as, lc, pw->pw_name, "ssh") <= 0) { debug("Approval failure for %s", user); pw = NULL; } diff -ru openssh-3.2.2p1/autom4te-2.53.cache/output.0 openssh-3.2.3p1/autom4te-2.53.cache/output.0 --- openssh-3.2.2p1/autom4te-2.53.cache/output.0 2002-05-16 09:42:49.000000000 +1000 +++ openssh-3.2.3p1/autom4te-2.53.cache/output.0 2002-05-22 15:11:21.000000000 +1000 @@ -865,7 +865,7 @@ --with-kerberos4=PATH Enable Kerberos 4 support --with-afs=PATH Enable AFS support --with-rsh=PATH Specify path to remote shell program - --with-privsep-path=xxx Path for privilege seperation chroot + --with-privsep-path=xxx Path for privilege separation chroot --with-xauth=PATH Specify path to xauth program --with-mantype=man|cat|doc Set man page type --with-md5-passwords Enable use of MD5 passwords @@ -15897,7 +15897,6 @@ fi # Set superuser path separately to user path -MD5_MSG="no" # Check whether --with-superuser-path or --without-superuser-path was given. if test "${with_superuser_path+set}" = set; then diff -ru openssh-3.2.2p1/autom4te-2.53.cache/traces.0 openssh-3.2.3p1/autom4te-2.53.cache/traces.0 --- openssh-3.2.2p1/autom4te-2.53.cache/traces.0 2002-05-16 09:42:49.000000000 +1000 +++ openssh-3.2.3p1/autom4te-2.53.cache/traces.0 2002-05-22 15:11:21.000000000 +1000 @@ -837,30 +837,30 @@ m4trace:configure.ac:1944: -1- AC_DEFINE_TRACE_LITERAL([IPADDR_IN_DISPLAY]) m4trace:configure.ac:2021: -1- AC_DEFINE_TRACE_LITERAL([USER_PATH]) m4trace:configure.ac:2022: -1- AC_SUBST([user_path]) -m4trace:configure.ac:2035: -1- AC_DEFINE_TRACE_LITERAL([SUPERUSER_PATH]) -m4trace:configure.ac:2048: -1- AC_DEFINE_TRACE_LITERAL([IPV4_DEFAULT]) -m4trace:configure.ac:2071: -1- AC_DEFINE_TRACE_LITERAL([IPV4_IN_IPV6]) -m4trace:configure.ac:2071: -1- AC_DEFINE_TRACE_LITERAL([IPV4_IN_IPV6]) -m4trace:configure.ac:2083: -1- AC_DEFINE_TRACE_LITERAL([BSD_AUTH]) -m4trace:configure.ac:2101: -1- AC_SUBST([SSHMODE]) -m4trace:configure.ac:2126: -1- AC_DEFINE_TRACE_LITERAL([_PATH_SSH_PIDDIR]) -m4trace:configure.ac:2127: -1- AC_SUBST([piddir]) -m4trace:configure.ac:2133: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LASTLOG]) -m4trace:configure.ac:2137: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) -m4trace:configure.ac:2141: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMPX]) -m4trace:configure.ac:2145: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) -m4trace:configure.ac:2149: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMPX]) -m4trace:configure.ac:2153: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LOGIN]) -m4trace:configure.ac:2157: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_PUTUTLINE]) -m4trace:configure.ac:2161: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_PUTUTXLINE]) -m4trace:configure.ac:2171: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LASTLOG]) -m4trace:configure.ac:2233: -1- AC_DEFINE_TRACE_LITERAL([CONF_LASTLOG_FILE]) -m4trace:configure.ac:2258: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) -m4trace:configure.ac:2263: -1- AC_DEFINE_TRACE_LITERAL([CONF_UTMP_FILE]) -m4trace:configure.ac:2288: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) -m4trace:configure.ac:2293: -1- AC_DEFINE_TRACE_LITERAL([CONF_WTMP_FILE]) -m4trace:configure.ac:2318: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMPX]) -m4trace:configure.ac:2321: -1- AC_DEFINE_TRACE_LITERAL([CONF_UTMPX_FILE]) -m4trace:configure.ac:2343: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMPX]) -m4trace:configure.ac:2346: -1- AC_DEFINE_TRACE_LITERAL([CONF_WTMPX_FILE]) -m4trace:configure.ac:2364: -1- AC_CONFIG_FILES([Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds]) +m4trace:configure.ac:2034: -1- AC_DEFINE_TRACE_LITERAL([SUPERUSER_PATH]) +m4trace:configure.ac:2047: -1- AC_DEFINE_TRACE_LITERAL([IPV4_DEFAULT]) +m4trace:configure.ac:2070: -1- AC_DEFINE_TRACE_LITERAL([IPV4_IN_IPV6]) +m4trace:configure.ac:2070: -1- AC_DEFINE_TRACE_LITERAL([IPV4_IN_IPV6]) +m4trace:configure.ac:2082: -1- AC_DEFINE_TRACE_LITERAL([BSD_AUTH]) +m4trace:configure.ac:2100: -1- AC_SUBST([SSHMODE]) +m4trace:configure.ac:2125: -1- AC_DEFINE_TRACE_LITERAL([_PATH_SSH_PIDDIR]) +m4trace:configure.ac:2126: -1- AC_SUBST([piddir]) +m4trace:configure.ac:2132: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LASTLOG]) +m4trace:configure.ac:2136: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) +m4trace:configure.ac:2140: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMPX]) +m4trace:configure.ac:2144: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) +m4trace:configure.ac:2148: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMPX]) +m4trace:configure.ac:2152: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LOGIN]) +m4trace:configure.ac:2156: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_PUTUTLINE]) +m4trace:configure.ac:2160: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_PUTUTXLINE]) +m4trace:configure.ac:2170: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_LASTLOG]) +m4trace:configure.ac:2232: -1- AC_DEFINE_TRACE_LITERAL([CONF_LASTLOG_FILE]) +m4trace:configure.ac:2257: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMP]) +m4trace:configure.ac:2262: -1- AC_DEFINE_TRACE_LITERAL([CONF_UTMP_FILE]) +m4trace:configure.ac:2287: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMP]) +m4trace:configure.ac:2292: -1- AC_DEFINE_TRACE_LITERAL([CONF_WTMP_FILE]) +m4trace:configure.ac:2317: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_UTMPX]) +m4trace:configure.ac:2320: -1- AC_DEFINE_TRACE_LITERAL([CONF_UTMPX_FILE]) +m4trace:configure.ac:2342: -1- AC_DEFINE_TRACE_LITERAL([DISABLE_WTMPX]) +m4trace:configure.ac:2345: -1- AC_DEFINE_TRACE_LITERAL([CONF_WTMPX_FILE]) +m4trace:configure.ac:2363: -1- AC_CONFIG_FILES([Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds]) diff -ru openssh-3.2.2p1/configure openssh-3.2.3p1/configure --- openssh-3.2.2p1/configure 2002-05-16 09:42:51.000000000 +1000 +++ openssh-3.2.3p1/configure 2002-05-22 15:11:22.000000000 +1000 @@ -865,7 +865,7 @@ --with-kerberos4=PATH Enable Kerberos 4 support --with-afs=PATH Enable AFS support --with-rsh=PATH Specify path to remote shell program - --with-privsep-path=xxx Path for privilege seperation chroot + --with-privsep-path=xxx Path for privilege separation chroot --with-xauth=PATH Specify path to xauth program --with-mantype=man|cat|doc Set man page type --with-md5-passwords Enable use of MD5 passwords @@ -15897,7 +15897,6 @@ fi # Set superuser path separately to user path -MD5_MSG="no" # Check whether --with-superuser-path or --without-superuser-path was given. if test "${with_superuser_path+set}" = set; then diff -ru openssh-3.2.2p1/configure.ac openssh-3.2.3p1/configure.ac --- openssh-3.2.2p1/configure.ac 2002-05-13 15:14:08.000000000 +1000 +++ openssh-3.2.3p1/configure.ac 2002-05-22 11:02:15.000000000 +1000 @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.61 2002/05/13 05:14:08 djm Exp $ +# $Id: configure.ac,v 1.63 2002/05/22 01:02:15 djm Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -1794,7 +1794,7 @@ PRIVSEP_PATH=/var/empty AC_ARG_WITH(privsep-path, - [ --with-privsep-path=xxx Path for privilege seperation chroot ], + [ --with-privsep-path=xxx Path for privilege separation chroot ], [ if test "x$withval" != "$no" ; then PRIVSEP_PATH=$withval @@ -2023,7 +2023,6 @@ fi # Set superuser path separately to user path -MD5_MSG="no" AC_ARG_WITH(superuser-path, [ --with-superuser-path= Specify different path for super-user], [ diff -ru openssh-3.2.2p1/contrib/caldera/openssh.spec openssh-3.2.3p1/contrib/caldera/openssh.spec --- openssh-3.2.2p1/contrib/caldera/openssh.spec 2002-05-16 09:26:16.000000000 +1000 +++ openssh-3.2.3p1/contrib/caldera/openssh.spec 2002-05-22 14:14:55.000000000 +1000 @@ -1,10 +1,10 @@ %define use-stable 1 %if %{use-stable} - %define version 3.2.2p1 + %define version 3.2.3p1 %define cvs %{nil} %define release 1 %else - %define version 3.2.2 + %define version 3.2.3 %define cvs cvs20020515 %define release 0r1 %endif @@ -224,4 +224,4 @@ %ChangeLog * Mon Jan 01 1998 ... -$Id: openssh.spec,v 1.32 2002/05/15 23:26:16 djm Exp $ +$Id: openssh.spec,v 1.33 2002/05/22 04:14:55 djm Exp $ diff -ru openssh-3.2.2p1/contrib/redhat/openssh.spec openssh-3.2.3p1/contrib/redhat/openssh.spec --- openssh-3.2.2p1/contrib/redhat/openssh.spec 2002-05-16 09:26:17.000000000 +1000 +++ openssh-3.2.3p1/contrib/redhat/openssh.spec 2002-05-22 14:14:55.000000000 +1000 @@ -1,4 +1,4 @@ -%define ver 3.2.2p1 +%define ver 3.2.3p1 %define rel 1 # OpenSSH privilege separation requires a user & group ID diff -ru openssh-3.2.2p1/contrib/suse/openssh.spec openssh-3.2.3p1/contrib/suse/openssh.spec --- openssh-3.2.2p1/contrib/suse/openssh.spec 2002-05-16 09:26:17.000000000 +1000 +++ openssh-3.2.3p1/contrib/suse/openssh.spec 2002-05-22 14:14:55.000000000 +1000 @@ -1,6 +1,6 @@ Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation Name: openssh -Version: 3.2.2p1 +Version: 3.2.3p1 URL: http://www.openssh.com/ Release: 1 Source0: openssh-%{version}.tar.gz Binary files openssh-3.2.2p1/scard/Ssh.bin and openssh-3.2.3p1/scard/Ssh.bin differ diff -ru openssh-3.2.2p1/scard/Ssh.bin.uu openssh-3.2.3p1/scard/Ssh.bin.uu --- openssh-3.2.2p1/scard/Ssh.bin.uu 2001-09-15 20:58:47.000000000 +1000 +++ openssh-3.2.3p1/scard/Ssh.bin.uu 2002-05-22 14:24:02.000000000 +1000 @@ -1,16 +1,17 @@ begin 644 Ssh.bin -M`P)!%P`501P`;``!`C@"`/Y@\`4`_J'P!0!!%T$;`?Z@\`4`01=!&@'^>/,! -M`4$701P!_G#S%P'^0],1`?Y@\!0`_G/S'0#^<]4``D$7L`4`_F'3``!!%T$9 -M`?YATP4`_G/5"P7^8=,'`OZAT`$!_J#0$@1!%T$8`0```$$7!`$&`/Y@`;@` -M`$$8\`H(`$$9\`H``$$:\@\``$$;\B$``$$<\A```/`&__(```0(`!8```9C -M""T#"<(H+00$*"T%""A;`&19``#P$/_R`P(&`0#(```38`!!70!&$UP`1@09 -M":1+``D*D`!@`"@37`!&!!E6`````*(````$____P````*$````0````*@`` -M`"````"-````,````&H37`!&`QD(2@`)"FX`8``H$UP`1@<9"@#_/2!@`$L1 -M2@`)"F<`8``H$UP`'A-<`$8($1-<`$8(7@!0"!%@`%59"C\`8`!:*PIS:&`` -M6BL37`!&`P,*`(!@`%\K`PH`@&``55D37`!&`P`"U9```````` +M`P)!&P`801X`>``!`E@"`/Y@\`4`_J'P!0!!&T$=`?Z@\`4`01M!'`'^>/,! +M`4$;01X!_G#S%P'^0],1`?Y@\!0`_G/S'0#^<]4``D$;L`4`_F'3``#^8=,% +M`/ZAT`$!_J#0)P'^H],*`?ZCTPD`_G/5"P7^8=,'`OZAT`H`_J#0$@3^:-,@ +M`T$;`P`%`/Y@`\A```/`0__(%`@8!`0H``&`` +M0205!!D)I$L`"0J0`&``*!4$&58``````.P````%____P````.D````0```` +M,P```"````#'````,````(T````R````V!4#&0A*``D*;@!@`"@5!QD*`/\] +M(6``1A)*``D*9P!@`"@*/P!@`$LK"1)@`$LK!6``4!P$#00#2@`.#01@`%5@ +M`%I@`"@37``>%0@2%0A>`%\($F``9%(`:`H_`&``2RL*7@`R10`/$UP`'@H`R`D07@`W!%>P!?_R`0$$`@`\```37P`` +M$V+^H2U?``5=``H38OZ@+5\`#UT`%!-B_G@M"@0`7P`970`>"@0`8``C10`) +/"F<`8``H$UX`+5D````` ` end diff -ru openssh-3.2.2p1/scard/Ssh.java openssh-3.2.3p1/scard/Ssh.java --- openssh-3.2.2p1/scard/Ssh.java 2001-09-15 20:58:47.000000000 +1000 +++ openssh-3.2.3p1/scard/Ssh.java 2002-05-22 14:24:02.000000000 +1000 @@ -1,4 +1,4 @@ -// $Id: Ssh.java,v 1.2 2001/09/15 10:58:47 djm Exp $ +// $Id: Ssh.java,v 1.3 2002/05/22 04:24:02 djm Exp $ // // Ssh.java // SSH / smartcard integration project, smartcard side @@ -42,6 +42,9 @@ public class Ssh extends javacard.framework.Applet { + // Change this when the applet changes; hi byte is major, low byte is minor + static final short applet_version = (short)0x0102; + /* constants declaration */ // code of CLA byte in the command APDU header static final byte Ssh_CLA =(byte)0x05; @@ -50,20 +53,19 @@ static final byte DECRYPT = (byte) 0x10; static final byte GET_KEYLENGTH = (byte) 0x20; static final byte GET_PUBKEY = (byte) 0x30; + static final byte GET_VERSION = (byte) 0x32; static final byte GET_RESPONSE = (byte) 0xc0; - /* instance variables declaration */ static final short keysize = 1024; + static final short root_fid = (short)0x3f00; + static final short privkey_fid = (short)0x0012; + static final short pubkey_fid = (short)(('s'<<8)|'h'); - //RSA_CRT_PrivateKey rsakey; + /* instance variables declaration */ AsymKey rsakey; CyberflexFile file; CyberflexOS os; - byte buffer[]; - - static byte[] keyHdr = {(byte)0xC2, (byte)0x01, (byte)0x05}; - private Ssh() { file = new CyberflexFile(); @@ -98,7 +100,8 @@ // APDU object carries a byte array (buffer) to // transfer incoming and outgoing APDU header // and data bytes between card and CAD - buffer = apdu.getBuffer(); + byte buffer[] = apdu.getBuffer(); + short size, st; // verify that if the applet can accept this // APDU message @@ -111,29 +114,47 @@ if (buffer[ISO.OFFSET_CLA] != Ssh_CLA) ISOException.throwIt(ISO.SW_CLA_NOT_SUPPORTED); //decrypt (apdu); - short size = (short) (buffer[ISO.OFFSET_LC] & 0x00FF); + size = (short) (buffer[ISO.OFFSET_LC] & 0x00FF); if (apdu.setIncomingAndReceive() != size) ISOException.throwIt (ISO.SW_WRONG_LENGTH); + // check access; depends on bit 2 (x/a) + file.selectFile(root_fid); + file.selectFile(privkey_fid); + st = os.checkAccess(ACL.EXECUTE); + if (st != ST.ACCESS_CLEARED) { + CyberflexAPDU.prepareSW1SW2(st); + ISOException.throwIt(CyberflexAPDU.getSW1SW2()); + } + rsakey.cryptoUpdate (buffer, (short) ISO.OFFSET_CDATA, size, buffer, (short) ISO.OFFSET_CDATA); apdu.setOutgoingAndSend ((short) ISO.OFFSET_CDATA, size); - return; + break; case GET_PUBKEY: - file.selectFile((short)(0x3f<<8)); // select root - file.selectFile((short)(('s'<<8)|'h')); // select public key file - os.readBinaryFile (buffer, (short)0, (short)0, (short)(keysize/8)); - apdu.setOutgoingAndSend((short)0, (short)(keysize/8)); - return; + file.selectFile(root_fid); // select root + file.selectFile(pubkey_fid); // select public key file + size = (short)(file.getFileSize() - 16); + st = os.readBinaryFile(buffer, (short)0, (short)0, size); + if (st == ST.SUCCESS) + apdu.setOutgoingAndSend((short)0, size); + else { + CyberflexAPDU.prepareSW1SW2(st); + ISOException.throwIt(CyberflexAPDU.getSW1SW2()); + } + break; case GET_KEYLENGTH: - buffer[0] = (byte)((keysize >> 8) & 0xff); - buffer[1] = (byte)(keysize & 0xff); + Util.setShort(buffer, (short)0, keysize); + apdu.setOutgoingAndSend ((short)0, (short)2); + break; + case GET_VERSION: + Util.setShort(buffer, (short)0, applet_version); apdu.setOutgoingAndSend ((short)0, (short)2); - return; + break; case GET_RESPONSE: - return; + break; default: ISOException.throwIt (ISO.SW_INS_NOT_SUPPORTED); } diff -ru openssh-3.2.2p1/scp.0 openssh-3.2.3p1/scp.0 --- openssh-3.2.2p1/scp.0 2002-05-16 09:42:39.000000000 +1000 +++ openssh-3.2.3p1/scp.0 2002-05-22 15:11:10.000000000 +1000 @@ -43,7 +43,7 @@ -q Disables the progress meter. - -C Compression enable. Passes the -C flag to ssh(1) to enable com- + -C Compression enable. Passes the -C flag to ssh(1) to enable comM-- pression. -F ssh_config @@ -63,7 +63,7 @@ -o ssh_option Can be used to pass options to ssh in the format used in the ssh(1) configuration file. This is useful for specifying options - for which there is no separate scp command-line flag. For exam- + for which there is no separate scp command-line flag. For examM-- ple, forcing the use of protocol version 1 is specified using scp -oProtocol=1. diff -ru openssh-3.2.2p1/sftp.0 openssh-3.2.3p1/sftp.0 --- openssh-3.2.2p1/sftp.0 2002-05-16 09:42:42.000000000 +1000 +++ openssh-3.2.3p1/sftp.0 2002-05-22 15:11:13.000000000 +1000 @@ -13,15 +13,15 @@ DESCRIPTION sftp is an interactive file transfer program, similar to ftp(1), which performs all operations over an encrypted ssh(1) transport. It may also - use many features of ssh, such as public key authentication and compres- + use many features of ssh, such as public key authentication and compresM-- sion. sftp connects and logs into the specified host, then enters an interactive command mode. - The second usage format will retrieve files automatically if a non-inter- - active authentication method is used; otherwise it will do so after suc- + The second usage format will retrieve files automatically if a non-interM-- + active authentication method is used; otherwise it will do so after sucM-- cessful interactive authentication. - The last usage format allows the sftp client to start in a remote direc- + The last usage format allows the sftp client to start in a remote direcM-- tory. The options are as follows: @@ -36,13 +36,13 @@ -o ssh_option Can be used to pass options to ssh in the format used in the ssh(1) configuration file. This is useful for specifying options - for which there is no separate sftp command-line flag. For exam- + for which there is no separate sftp command-line flag. For examM-- ple, to specify an alternate port use: sftp -oPort=24. -s subsystem | sftp_server Specifies the SSH2 subsystem or the path for an sftp server on the remote host. A path is useful for using sftp over protocol - version 1, or when the remote sshd does not have an sftp subsys- + version 1, or when the remote sshd does not have an sftp subsysM-- tem configured. -v Raise logging level. This option is also passed to ssh. @@ -106,7 +106,7 @@ help Display help text. lls [ls-options [path]] - Display local directory listing of either path or current direc- + Display local directory listing of either path or current direcM-- tory if path is not specified. lmkdir path @@ -118,7 +118,7 @@ lpwd Print local working directory. ls [path] - Display remote directory listing of either path or current direc- + Display remote directory listing of either path or current direcM-- tory if path is not specified. lumask umask diff -ru openssh-3.2.2p1/ssh-add.0 openssh-3.2.3p1/ssh-add.0 --- openssh-3.2.2p1/ssh-add.0 2002-05-16 09:42:39.000000000 +1000 +++ openssh-3.2.3p1/ssh-add.0 2002-05-22 15:11:10.000000000 +1000 @@ -11,7 +11,7 @@ DESCRIPTION ssh-add adds RSA or DSA identities to the authentication agent, ssh-agent(1). When run without arguments, it adds the files - $HOME/.ssh/id_rsa, $HOME/.ssh/id_dsa and $HOME/.ssh/identity. Alterna- + $HOME/.ssh/id_rsa, $HOME/.ssh/id_dsa and $HOME/.ssh/identity. AlternaM-- tive file names can be given on the command line. If any file requires a passphrase, ssh-add asks for the passphrase from the user. The passphrase is read from the user's tty. ssh-add retries the last @@ -25,7 +25,7 @@ -l Lists fingerprints of all identities currently represented by the agent. - -L Lists public key parameters of all identities currently repre- + -L Lists public key parameters of all identities currently repreM-- sented by the agent. -d Instead of adding the identity, removes the identity from the @@ -73,7 +73,7 @@ AUTHORS OpenSSH is a derivative of the original and free ssh 1.2.12 release by Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo - de Raadt and Dug Song removed many bugs, re-added newer features and cre- + de Raadt and Dug Song removed many bugs, re-added newer features and creM-- ated OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. diff -ru openssh-3.2.2p1/ssh-agent.0 openssh-3.2.3p1/ssh-agent.0 --- openssh-3.2.2p1/ssh-agent.0 2002-05-16 09:42:39.000000000 +1000 +++ openssh-3.2.3p1/ssh-agent.0 2002-05-22 15:11:10.000000000 +1000 @@ -8,9 +8,9 @@ ssh-agent [-c | -s] -k DESCRIPTION - ssh-agent is a program to hold private keys used for public key authenti- - cation (RSA, DSA). The idea is that ssh-agent is started in the begin- - ning of an X-session or a login session, and all other windows or pro- + ssh-agent is a program to hold private keys used for public key authentiM-- + cation (RSA, DSA). The idea is that ssh-agent is started in the beginM-- + ning of an X-session or a login session, and all other windows or proM-- grams are started as clients to the ssh-agent program. Through use of environment variables the agent can be located and automatically used for authentication when logging in to other machines using ssh(1). @@ -36,17 +36,17 @@ ssh-add(1). When executed without arguments, ssh-add(1) adds the files $HOME/.ssh/id_rsa, $HOME/.ssh/id_dsa and $HOME/.ssh/identity. If the identity has a passphrase, ssh-add(1) asks for the passphrase (using a - small X11 application if running under X11, or from the terminal if run- - ning without X). It then sends the identity to the agent. Several iden- + small X11 application if running under X11, or from the terminal if runM-- + ning without X). It then sends the identity to the agent. Several idenM-- tities can be stored in the agent; the agent can automatically use any of these identities. ssh-add -l displays the identities currently held by the agent. - The idea is that the agent is run in the user's local PC, laptop, or ter- + The idea is that the agent is run in the user's local PC, laptop, or terM-- minal. Authentication data need not be stored on any other machine, and - authentication passphrases never go over the network. However, the con- + authentication passphrases never go over the network. However, the conM-- nection to the agent is forwarded over SSH remote logins, and the user - can thus use the privileges given by the identities anywhere in the net- + can thus use the privileges given by the identities anywhere in the netM-- work in a secure way. There are two main ways to get an agent setup: Either the agent starts a @@ -58,7 +58,7 @@ The agent will never send a private key over its request channel. Instead, operations that require a private key will be performed by the - agent, and the result will be returned to the requester. This way, pri- + agent, and the result will be returned to the requester. This way, priM-- vate keys are not exposed to clients using the agent. A unix-domain socket is created (/tmp/ssh-XXXXXXXX/agent.), and the @@ -85,7 +85,7 @@ the user. /tmp/ssh-XXXXXXXX/agent. - Unix-domain sockets used to contain the connection to the authen- + Unix-domain sockets used to contain the connection to the authenM-- tication agent. These sockets should only be readable by the owner. The sockets should get automatically removed when the agent exits. @@ -93,7 +93,7 @@ AUTHORS OpenSSH is a derivative of the original and free ssh 1.2.12 release by Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo - de Raadt and Dug Song removed many bugs, re-added newer features and cre- + de Raadt and Dug Song removed many bugs, re-added newer features and creM-- ated OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. diff -ru openssh-3.2.2p1/ssh-keygen.0 openssh-3.2.3p1/ssh-keygen.0 --- openssh-3.2.2p1/ssh-keygen.0 2002-05-16 09:42:40.000000000 +1000 +++ openssh-3.2.3p1/ssh-keygen.0 2002-05-22 15:11:10.000000000 +1000 @@ -24,7 +24,7 @@ Normally each user wishing to use SSH with RSA or DSA authentication runs this once to create the authentication key in $HOME/.ssh/identity, - $HOME/.ssh/id_dsa or $HOME/.ssh/id_rsa. Additionally, the system admin- + $HOME/.ssh/id_dsa or $HOME/.ssh/id_rsa. Additionally, the system adminM-- istrator may use this to generate host keys, as seen in /etc/rc. Normally this program generates the key and asks for a file in which to @@ -33,7 +33,7 @@ passphrase may be empty to indicate no passphrase (host keys must have an empty passphrase), or it may be a string of arbitrary length. A passphrase is similar to a password, except it can be a phrase with a - series of words, punctuation, numbers, whitespace, or any string of char- + series of words, punctuation, numbers, whitespace, or any string of charM-- acters you want. Good passphrases are 10-30 characters long, are not simple sentences or otherwise easily guessable (English prose has only 1-2 bits of entropy per character, and provides very bad passphrases), @@ -47,7 +47,7 @@ For RSA1 keys, there is also a comment field in the key file that is only for convenience to the user to help identify the key. The comment can - tell what the key is for, or whatever is useful. The comment is initial- + tell what the key is for, or whatever is useful. The comment is initialM-- ized to ``user@host'' when the key is created, but can be changed using the -c option. @@ -63,7 +63,7 @@ slower. The default is 1024 bits. -c Requests changing the comment in the private and public key - files. This operation is only supported for RSA1 keys. The pro- + files. This operation is only supported for RSA1 keys. The proM-- gram will prompt for the file containing the private keys, for the passphrase if the key has one, and for the new comment. @@ -97,7 +97,7 @@ -t type Specifies the type of the key to create. The possible values are - ``rsa1'' for protocol version 1 and ``rsa'' or ``dsa'' for proto- + ``rsa1'' for protocol version 1 and ``rsa'' or ``dsa'' for protoM-- col version 2. -B Show the bubblebabble digest of specified private or public key @@ -129,7 +129,7 @@ key. ssh(1) will read this file when a login attempt is made. $HOME/.ssh/identity.pub - Contains the protocol version 1 RSA public key for authentica- + Contains the protocol version 1 RSA public key for authenticaM-- tion. The contents of this file should be added to $HOME/.ssh/authorized_keys on all machines where the user wishes to log in using RSA authentication. There is no need to keep the @@ -145,7 +145,7 @@ key. ssh(1) will read this file when a login attempt is made. $HOME/.ssh/id_dsa.pub - Contains the protocol version 2 DSA public key for authentica- + Contains the protocol version 2 DSA public key for authenticaM-- tion. The contents of this file should be added to $HOME/.ssh/authorized_keys on all machines where the user wishes to log in using public key authentication. There is no need to @@ -161,7 +161,7 @@ key. ssh(1) will read this file when a login attempt is made. $HOME/.ssh/id_rsa.pub - Contains the protocol version 2 RSA public key for authentica- + Contains the protocol version 2 RSA public key for authenticaM-- tion. The contents of this file should be added to $HOME/.ssh/authorized_keys on all machines where the user wishes to log in using public key authentication. There is no need to @@ -170,7 +170,7 @@ AUTHORS OpenSSH is a derivative of the original and free ssh 1.2.12 release by Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo - de Raadt and Dug Song removed many bugs, re-added newer features and cre- + de Raadt and Dug Song removed many bugs, re-added newer features and creM-- ated OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. diff -ru openssh-3.2.2p1/ssh-keyscan.0 openssh-3.2.3p1/ssh-keyscan.0 --- openssh-3.2.2p1/ssh-keyscan.0 2002-05-16 09:42:40.000000000 +1000 +++ openssh-3.2.3p1/ssh-keyscan.0 2002-05-22 15:11:11.000000000 +1000 @@ -8,16 +8,16 @@ [host | addrlist namelist] [...] DESCRIPTION - ssh-keyscan is a utility for gathering the public ssh host keys of a num- + ssh-keyscan is a utility for gathering the public ssh host keys of a numM-- ber of hosts. It was designed to aid in building and verifying ssh_known_hosts files. ssh-keyscan provides a minimal interface suitable for use by shell and perl scripts. - ssh-keyscan uses non-blocking socket I/O to contact as many hosts as pos- + ssh-keyscan uses non-blocking socket I/O to contact as many hosts as posM-- sible in parallel, so it is very efficient. The keys from a domain of 1,000 hosts can be collected in tens of seconds, even when some of those hosts are down or do not run ssh. For scanning, one does not need login - access to the machines that are being scanned, nor does the scanning pro- + access to the machines that are being scanned, nor does the scanning proM-- cess involve any encryption. The options are as follows: @@ -52,7 +52,7 @@ -6 Forces ssh-keyscan to use IPv6 addresses only. SECURITY - If a ssh_known_hosts file is constructed using ssh-keyscan without veri- + If a ssh_known_hosts file is constructed using ssh-keyscan without veriM-- fying the keys, users will be vulnerable to attacks. On the other hand, if the security model allows such a risk, ssh-keyscan can help in the detection of tampered keyfiles or man in the middle attacks which have diff -ru openssh-3.2.2p1/ssh-rand-helper.0 openssh-3.2.3p1/ssh-rand-helper.0 --- openssh-3.2.2p1/ssh-rand-helper.0 2002-05-16 09:42:42.000000000 +1000 +++ openssh-3.2.3p1/ssh-rand-helper.0 2002-05-22 15:11:13.000000000 +1000 @@ -27,7 +27,7 @@ random numbers from a EGD/PRNGd server via a unix domain or localhost tcp socket. - This program is not intended to be run by the end-user, so the few com- + This program is not intended to be run by the end-user, so the few comM-- mandline options are for debugging purposes only. -b bytes diff -ru openssh-3.2.2p1/ssh.0 openssh-3.2.3p1/ssh.0 --- openssh-3.2.2p1/ssh.0 2002-05-16 09:42:41.000000000 +1000 +++ openssh-3.2.3p1/ssh.0 2002-05-22 15:11:11.000000000 +1000 @@ -33,13 +33,13 @@ This form of authentication alone is normally not allowed by the server because it is not secure. - The second authentication method is the rhosts or hosts.equiv method com- + The second authentication method is the rhosts or hosts.equiv method comM-- bined with RSA-based host authentication. It means that if the login would be permitted by $HOME/.rhosts, $HOME/.shosts, /etc/hosts.equiv, or /etc/shosts.equiv, and if additionally the server can verify the client's host key (see /etc/ssh/ssh_known_hosts and $HOME/.ssh/known_hosts in the FILES section), only then login is permitted. This authentication method - closes security holes due to IP spoofing, DNS spoofing and routing spoof- + closes security holes due to IP spoofing, DNS spoofing and routing spoofM-- ing. [Note to the administrator: /etc/hosts.equiv, $HOME/.rhosts, and the rlogin/rsh protocol in general, are inherently insecure and should be disabled if security is desired.] @@ -57,7 +57,7 @@ checks if this key is permitted, and if so, sends the user (actually the ssh program running on behalf of the user) a challenge, a random number, encrypted by the user's public key. The challenge can only be decrypted - using the proper private key. The user's client then decrypts the chal- + using the proper private key. The user's client then decrypts the chalM-- lenge using the private key, proving that he/she knows the private key but without disclosing it to the server. @@ -69,13 +69,13 @@ directory on the remote machine (the authorized_keys file corresponds to the conventional $HOME/.rhosts file, and has one key per line, though the lines can be very long). After this, the user can log in without giving - the password. RSA authentication is much more secure than rhosts authen- + the password. RSA authentication is much more secure than rhosts authenM-- tication. - The most convenient way to use RSA authentication may be with an authen- + The most convenient way to use RSA authentication may be with an authenM-- tication agent. See ssh-agent(1) for more information. - If other authentication methods fail, ssh prompts the user for a pass- + If other authentication methods fail, ssh prompts the user for a passM-- word. The password is sent to the remote host for checking; however, since all communications are encrypted, the password cannot be seen by someone listening on the network. @@ -102,10 +102,10 @@ If public key authentication fails or is not available a password can be sent encrypted to the remote host for proving the user's identity. - Additionally, ssh supports hostbased or challenge response authentica- + Additionally, ssh supports hostbased or challenge response authenticaM-- tion. - Protocol 2 provides additional mechanisms for confidentiality (the traf- + Protocol 2 provides additional mechanisms for confidentiality (the trafM-- fic is encrypted using 3DES, Blowfish, CAST128 or Arcfour) and integrity (hmac-md5, hmac-sha1). Note that protocol 1 lacks a strong mechanism for ensuring the integrity of the connection. @@ -126,18 +126,18 @@ if a tty is used. The session terminates when the command or shell on the remote machine - exits and all X11 and TCP/IP connections have been closed. The exit sta- + exits and all X11 and TCP/IP connections have been closed. The exit staM-- tus of the remote program is returned as the exit status of ssh. Escape Characters - When a pseudo terminal has been requested, ssh supports a number of func- + When a pseudo terminal has been requested, ssh supports a number of funcM-- tions through the use of an escape character. A single tilde character can be sent as ~~ or by following the tilde by a character other than those described below. The escape character must - always follow a newline to be interpreted as special. The escape charac- - ter can be changed in configuration files using the EscapeChar configura- + always follow a newline to be interpreted as special. The escape characM-- + ter can be changed in configuration files using the EscapeChar configuraM-- tion directive or on the command line by the -e option. The supported escapes (assuming the default `~') are: @@ -167,7 +167,7 @@ is automatically forwarded to the remote side in such a way that any X11 programs started from the shell (or command) will go through the encrypted channel, and the connection to the real X server will be made - from the local machine. The user should not manually set DISPLAY. For- + from the local machine. The user should not manually set DISPLAY. ForM-- warding of X11 connections can be configured on the command line or in configuration files. @@ -184,7 +184,7 @@ machine (and no cookies are sent in the plain). If the user is using an authentication agent, the connection to the agent - is automatically forwarded to the remote side unless disabled on the com- + is automatically forwarded to the remote side unless disabled on the comM-- mand line or in a configuration file. Forwarding of arbitrary TCP/IP connections over the secure channel can be @@ -194,13 +194,13 @@ Server authentication - ssh automatically maintains and checks a database containing identifica- + ssh automatically maintains and checks a database containing identificaM-- tions for all hosts it has ever been used with. Host keys are stored in $HOME/.ssh/known_hosts in the user's home directory. Additionally, the file /etc/ssh/ssh_known_hosts is automatically checked for known hosts. Any new hosts are automatically added to the user's file. If a host's identification ever changes, ssh warns about this and disables password - authentication to prevent a trojan horse from getting the user's pass- + authentication to prevent a trojan horse from getting the user's passM-- word. Another purpose of this mechanism is to prevent man-in-the-middle attacks which could otherwise be used to circumvent the encryption. The StrictHostKeyChecking option (see below) can be used to prevent logins to @@ -256,7 +256,7 @@ for protocol version 1, and $HOME/.ssh/id_rsa and $HOME/.ssh/id_dsa for protocol version 2. Identity files may also be specified on a per-host basis in the configuration file. - It is possible to have multiple -i options (and multiple identi- + It is possible to have multiple -i options (and multiple identiM-- ties specified in configuration files). -I smartcard_device @@ -286,11 +286,11 @@ ssh needs to ask for a password or passphrase; see also the -f option.) - -N Do not execute a remote command. This is useful for just for- + -N Do not execute a remote command. This is useful for just forM-- warding ports (protocol version 2 only). -o option - Can be used to give options in the format used in the configura- + Can be used to give options in the format used in the configuraM-- tion file. This is useful for specifying options for which there is no separate command-line flag. @@ -308,11 +308,11 @@ -s May be used to request invocation of a subsystem on the remote system. Subsystems are a feature of the SSH2 protocol which - facilitate the use of SSH as a secure transport for other appli- - cations (eg. sftp). The subsystem is specified as the remote com- + facilitate the use of SSH as a secure transport for other appliM-- + cations (eg. sftp). The subsystem is specified as the remote comM-- mand. - -t Force pseudo-tty allocation. This can be used to execute arbi- + -t Force pseudo-tty allocation. This can be used to execute arbiM-- trary screen-based programs on a remote machine, which can be very useful, e.g., when implementing menu services. Multiple -t options force tty allocation, even if ssh has no local tty. @@ -320,7 +320,7 @@ -T Disable pseudo-tty allocation. -v Verbose mode. Causes ssh to print debugging messages about its - progress. This is helpful in debugging connection, authentica- + progress. This is helpful in debugging connection, authenticaM-- tion, and configuration problems. Multiple -v options increases the verbosity. Maximum is 3. @@ -335,11 +335,11 @@ ``level'' can be controlled by the CompressionLevel option (see below). Compression is desirable on modem lines and other slow connections, but will only slow down things on fast networks. - The default value can be set on a host-by-host basis in the con- + The default value can be set on a host-by-host basis in the conM-- figuration files; see the Compression option below. -F configfile - Specifies an alternative per-user configuration file. If a con- + Specifies an alternative per-user configuration file. If a conM-- figuration file is given on the command line, the system-wide configuration file (/etc/ssh/ssh_config) will be ignored. The default for the per-user configuration file is $HOME/.ssh/config. @@ -351,7 +351,7 @@ and whenever a connection is made to this port, the connection is forwarded over the secure channel, and a connection is made to host port hostport from the remote machine. Port forwardings can - also be specified in the configuration file. Only root can for- + also be specified in the configuration file. Only root can forM-- ward privileged ports. IPv6 addresses can be specified with an alternative syntax: port/host/hostport @@ -359,9 +359,9 @@ Specifies that the given port on the remote (server) host is to be forwarded to the given host and port on the local side. This works by allocating a socket to listen to port on the remote - side, and whenever a connection is made to this port, the connec- + side, and whenever a connection is made to this port, the connecM-- tion is forwarded over the secure channel, and a connection is - made to host port hostport from the local machine. Port forward- + made to host port hostport from the local machine. Port forwardM-- ings can also be specified in the configuration file. Privileged ports can be forwarded only when logging in as root on the remote machine. IPv6 addresses can be specified with an alternative @@ -370,11 +370,11 @@ -D port Specifies a local ``dynamic'' application-level port forwarding. This works by allocating a socket to listen to port on the local - side, and whenever a connection is made to this port, the connec- + side, and whenever a connection is made to this port, the connecM-- tion is forwarded over the secure channel, and the application protocol is then used to determine where to connect to from the remote machine. Currently the SOCKS4 protocol is supported, and - ssh will act as a SOCKS4 server. Only root can forward privi- + ssh will act as a SOCKS4 server. Only root can forward priviM-- leged ports. Dynamic port forwardings can also be specified in the configuration file. @@ -387,7 +387,7 @@ -6 Forces ssh to use IPv6 addresses only. CONFIGURATION FILES - ssh obtains configuration data from the following sources in the follow- + ssh obtains configuration data from the following sources in the followM-- ing order: command line options, user's configuration file ($HOME/.ssh/config), and system-wide configuration file (/etc/ssh/ssh_config). For each parameter, the first obtained value will @@ -396,7 +396,7 @@ of the patterns given in the specification. The matched host name is the one given on the command line. - Since the first obtained value for each parameter is used, more host-spe- + Since the first obtained value for each parameter is used, more host-speM-- cific declarations should be given near the beginning of the file, and general defaults at the end. @@ -406,23 +406,23 @@ Otherwise a line is of the format ``keyword arguments''. Configuration options may be separated by whitespace or optional whitespace and exactly - one `='; the latter format is useful to avoid the need to quote whites- + one `='; the latter format is useful to avoid the need to quote whitesM-- pace when specifying configuration options using the ssh, scp and sftp -o option. - The possible keywords and their meanings are as follows (note that key- + The possible keywords and their meanings are as follows (note that keyM-- words are case-insensitive and arguments are case-sensitive): - Host Restricts the following declarations (up to the next Host key- + Host Restricts the following declarations (up to the next Host keyM-- word) to be only for those hosts that match one of the patterns given after the keyword. `*' and `'? can be used as wildcards - in the patterns. A single `*' as a pattern can be used to pro- + in the patterns. A single `*' as a pattern can be used to proM-- vide global defaults for all hosts. The host is the hostname - argument given on the command line (i.e., the name is not con- + argument given on the command line (i.e., the name is not conM-- verted to a canonicalized host name before matching). AFSTokenPassing - Specifies whether to pass AFS tokens to remote host. The argu- + Specifies whether to pass AFS tokens to remote host. The arguM-- ment to this keyword must be ``yes'' or ``no''. This option applies to protocol version 1 only. @@ -444,7 +444,7 @@ is set to ``no'', the check will not be executed. The default is ``yes''. - Cipher Specifies the cipher to use for encrypting the session in proto- + Cipher Specifies the cipher to use for encrypting the session in protoM-- col version 1. Currently, ``blowfish'', ``3des'', and ``des'' are supported. des is only supported in the ssh client for interoperability with legacy protocol 1 implementations that do @@ -464,7 +464,7 @@ specified in the configuration files or on the command line be cleared. This option is primarily useful when used from the ssh command line to clear port forwardings set in configuration - files, and is automatically set by scp(1) and sftp(1). The argu- + files, and is automatically set by scp(1) and sftp(1). The arguM-- ment must be ``yes'' or ``no''. The default is ``no''. Compression @@ -488,17 +488,17 @@ Specifies that a TCP/IP port on the local machine be forwarded over the secure channel, and the application protocol is then used to determine where to connect to from the remote machine. - The argument must be a port number. Currently the SOCKS4 proto- + The argument must be a port number. Currently the SOCKS4 protoM-- col is supported, and ssh will act as a SOCKS4 server. Multiple forwardings may be specified, and additional forwardings can be - given on the command line. Only the superuser can forward privi- + given on the command line. Only the superuser can forward priviM-- leged ports. EscapeChar Sets the escape character (default: `~'). The escape character can also be set on the command line. The argument should be a - single character, `^' followed by a letter, or ``none'' to dis- - able the escape character entirely (making the connection trans- + single character, `^' followed by a letter, or ``none'' to disM-- + able the escape character entirely (making the connection transM-- parent for binary data). FallBackToRsh @@ -514,7 +514,7 @@ be ``yes'' or ``no''. The default is ``no''. ForwardX11 - Specifies whether X11 connections will be automatically redi- + Specifies whether X11 connections will be automatically rediM-- rected over the secure channel and DISPLAY set. The argument must be ``yes'' or ``no''. The default is ``no''. @@ -522,7 +522,7 @@ Specifies whether remote hosts are allowed to connect to local forwarded ports. By default, ssh binds local port forwardings to the loopback addresss. This prevents other remote hosts from - connecting to forwarded ports. GatewayPorts can be used to spec- + connecting to forwarded ports. GatewayPorts can be used to specM-- ify that ssh should bind local port forwardings to the wildcard address, thus allowing remote hosts to connect to forwarded ports. The argument must be ``yes'' or ``no''. The default is @@ -546,23 +546,23 @@ HostKeyAlias Specifies an alias that should be used instead of the real host name when looking up or saving the host key in the host key - database files. This option is useful for tunneling ssh connec- + database files. This option is useful for tunneling ssh connecM-- tions or for multiple servers running on a single host. HostName Specifies the real host name to log into. This can be used to specify nicknames or abbreviations for hosts. Default is the name given on the command line. Numeric IP addresses are also - permitted (both on the command line and in HostName specifica- + permitted (both on the command line and in HostName specificaM-- tions). IdentityFile Specifies a file from which the user's RSA or DSA authentication identity is read. The default is $HOME/.ssh/identity for protocol - version 1, and $HOME/.ssh/id_rsa and $HOME/.ssh/id_dsa for proto- + version 1, and $HOME/.ssh/id_rsa and $HOME/.ssh/id_dsa for protoM-- col version 2. Additionally, any identities represented by the authentication agent will be used for authentication. The file - name may use the tilde syntax to refer to a user's home direc- + name may use the tilde syntax to refer to a user's home direcM-- tory. It is possible to have multiple identity files specified in configuration files; all these identities will be tried in sequence. @@ -571,7 +571,7 @@ Specifies whether the system should send TCP keepalive messages to the other side. If they are sent, death of the connection or crash of one of the machines will be properly noticed. However, - this means that connections will die if the route is down tem- + this means that connections will die if the route is down temM-- porarily, and some people find it annoying. The default is ``yes'' (to send keepalives), and the client will @@ -596,18 +596,18 @@ remote machine. The first argument must be a port number, and the second must be host:port. IPv6 addresses can be specified with an alternative syntax: host/port. Multiple forwardings may - be specified, and additional forwardings can be given on the com- + be specified, and additional forwardings can be given on the comM-- mand line. Only the superuser can forward privileged ports. LogLevel Gives the verbosity level that is used when logging messages from - ssh. The possible values are: QUIET, FATAL, ERROR, INFO, VER- + ssh. The possible values are: QUIET, FATAL, ERROR, INFO, VERM-- BOSE, DEBUG, DEBUG1, DEBUG2 and DEBUG3. The default is INFO. DEBUG and DEBUG1 are equivalent. DEBUG2 and DEBUG3 each specify higher levels of verbose output. MACs Specifies the MAC (message authentication code) algorithms in - order of preference. The MAC algorithm is used in protocol ver- + order of preference. The MAC algorithm is used in protocol verM-- sion 2 for data integrity protection. Multiple algorithms must be comma-separated. The default is ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96''. @@ -615,7 +615,7 @@ NoHostAuthenticationForLocalhost This option can be used if the home directory is shared across machines. In this case localhost will refer to a different - machine on each of the machines and the user will get many warn- + machine on each of the machines and the user will get many warnM-- ings about changed host keys. However, this option disables host authentication for localhost. The argument to this keyword must be ``yes'' or ``no''. The default is to check the host key for @@ -648,13 +648,13 @@ version 2 is not available. ProxyCommand - Specifies the command to use to connect to the server. The com- + Specifies the command to use to connect to the server. The comM-- mand string extends to the end of the line, and is executed with /bin/sh. In the command string, `%h' will be substituted by the host name to connect and `%p' by the port. The command can be basically anything, and should read from its standard input and write to its standard output. It should eventually connect an - sshd(8) server running on some machine, or execute sshd -i some- + sshd(8) server running on some machine, or execute sshd -i someM-- where. Host key management will be done using the HostName of the host being connected (defaulting to the name typed by the user). Note that CheckHostIP is not available for connects with @@ -679,7 +679,7 @@ this declaration only affects the client side and has no effect whatsoever on security. Disabling rhosts authentication may reduce authentication time on slow connections when rhosts - authentication is not used. Most servers do not permit Rhost- + authentication is not used. Most servers do not permit RhostM-- sAuthentication because it is not secure (see RhostsRSAAuthentication). The argument to this keyword must be ``yes'' or ``no''. The default is ``yes''. This option applies @@ -694,7 +694,7 @@ RSAAuthentication Specifies whether to try RSA authentication. The argument to this keyword must be ``yes'' or ``no''. RSA authentication will - only be attempted if the identity file exists, or an authentica- + only be attempted if the identity file exists, or an authenticaM-- tion agent is running. The default is ``yes''. Note that this option applies to protocol version 1 only. @@ -705,13 +705,13 @@ SmartcardDevice Specifies which smartcard device to use. The argument to this - keyword is the device ssh should use to communicate with a smart- + keyword is the device ssh should use to communicate with a smartM-- card used for storing the user's private RSA key. By default, no device is specified and smartcard support is not activated. StrictHostKeyChecking If this flag is set to ``yes'', ssh will never automatically add - host keys to the $HOME/.ssh/known_hosts file, and refuses to con- + host keys to the $HOME/.ssh/known_hosts file, and refuses to conM-- nect to hosts whose host key has changed. This provides maximum protection against trojan horse attacks, however, can be annoying when the /etc/ssh/ssh_known_hosts file is poorly maintained, or @@ -727,15 +727,15 @@ ``ask''. UsePrivilegedPort - Specifies whether to use a privileged port for outgoing connec- + Specifies whether to use a privileged port for outgoing connecM-- tions. The argument must be ``yes'' or ``no''. The default is ``no''. Note that this option must be set to ``yes'' if RhostsAuthentication and RhostsRSAAuthentication authentications are needed with older servers. - User Specifies the user to log in as. This can be useful when a dif- + User Specifies the user to log in as. This can be useful when a difM-- ferent user name is used on different machines. This saves the - trouble of having to remember to give the user name on the com- + trouble of having to remember to give the user name on the comM-- mand line. UserKnownHostsFile @@ -790,17 +790,17 @@ with the agent. SSH_CLIENT - Identifies the client end of the connection. The variable con- + Identifies the client end of the connection. The variable conM-- tains three space-separated values: client ip-address, client port number, and server port number. SSH_ORIGINAL_COMMAND - The variable contains the original command line if a forced com- - mand is executed. It can be used to extract the original argu- + The variable contains the original command line if a forced comM-- + mand is executed. It can be used to extract the original arguM-- ments. SSH_TTY - This is set to the name of the tty (path to the device) associ- + This is set to the name of the tty (path to the device) associM-- ated with the current shell or command. If the current session has no tty, this variable is not set. @@ -823,7 +823,7 @@ protocol 1 RSA, protocol 2 DSA, and protocol 2 RSA, respectively. These files contain sensitive data and should be readable by the user but not accessible by others (read/write/execute). Note - that ssh ignores a private key file if it is accessible by oth- + that ssh ignores a private key file if it is accessible by othM-- ers. It is possible to specify a passphrase when generating the key; the passphrase will be used to encrypt the sensitive part of this file using 3DES. @@ -833,13 +833,13 @@ identity file in human-readable form). The contents of the $HOME/.ssh/identity.pub file should be added to $HOME/.ssh/authorized_keys on all machines where the user wishes - to log in using protocol version 1 RSA authentication. The con- + to log in using protocol version 1 RSA authentication. The conM-- tents of the $HOME/.ssh/id_dsa.pub and $HOME/.ssh/id_rsa.pub file should be added to $HOME/.ssh/authorized_keys on all machines where the user wishes to log in using protocol version 2 DSA/RSA authentication. These files are not sensitive and can (but need - not) be readable by anyone. These files are never used automati- - cally and are not necessary; they are only provided for the con- + not) be readable by anyone. These files are never used automatiM-- + cally and are not necessary; they are only provided for the conM-- venience of the user. $HOME/.ssh/config @@ -862,9 +862,9 @@ by the system administrator to contain the public host keys of all machines in the organization. This file should be world- readable. This file contains public keys, one per line, in the - following format (fields separated by spaces): system name, pub- + following format (fields separated by spaces): system name, pubM-- lic key and optional comment field. When different names are - used for the same machine, all such names should be listed, sepa- + used for the same machine, all such names should be listed, sepaM-- rated by commas. The format is described on the sshd(8) manual page. @@ -895,7 +895,7 @@ Each line of the file contains a host name (in the canonical form returned by name servers), and then a user name on that host, separated by a space. On some machines this file may need to be - world-readable if the user's home directory is on a NFS parti- + world-readable if the user's home directory is on a NFS partiM-- tion, because sshd(8) reads it as root. Additionally, this file must be owned by the user, and must not have write permissions for anyone else. The recommended permission for most machines is @@ -905,7 +905,7 @@ requires successful RSA host authentication before permitting .rhosts authentication. If the server machine does not have the client's host key in /etc/ssh/ssh_known_hosts, it can be stored - in $HOME/.ssh/known_hosts. The easiest way to do this is to con- + in $HOME/.ssh/known_hosts. The easiest way to do this is to conM-- nect back to the client from the server machine using ssh; this will automatically add the host key to $HOME/.ssh/known_hosts. @@ -949,7 +949,7 @@ AUTHORS OpenSSH is a derivative of the original and free ssh 1.2.12 release by Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo - de Raadt and Dug Song removed many bugs, re-added newer features and cre- + de Raadt and Dug Song removed many bugs, re-added newer features and creM-- ated OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. diff -ru openssh-3.2.2p1/sshd.0 openssh-3.2.3p1/sshd.0 --- openssh-3.2.2p1/sshd.0 2002-05-16 09:42:41.000000000 +1000 +++ openssh-3.2.3p1/sshd.0 2002-05-22 15:11:12.000000000 +1000 @@ -8,21 +8,21 @@ [-h host_key_file] [-k key_gen_time] [-o option] [-p port] [-u len] DESCRIPTION - sshd (SSH Daemon) is the daemon program for ssh(1). Together these pro- + sshd (SSH Daemon) is the daemon program for ssh(1). Together these proM-- grams replace rlogin and rsh, and provide secure encrypted communications between two untrusted hosts over an insecure network. The programs are intended to be as easy to install and use as possible. - sshd is the daemon that listens for connections from clients. It is nor- + sshd is the daemon that listens for connections from clients. It is norM-- mally started at boot from /etc/rc. It forks a new daemon for each incoming connection. The forked daemons handle key exchange, encryption, - authentication, command execution, and data exchange. This implementa- + authentication, command execution, and data exchange. This implementaM-- tion of sshd supports both SSH protocol version 1 and 2 simultaneously. sshd works as follows. SSH protocol version 1 - Each host has a host-specific RSA key (normally 1024 bits) used to iden- + Each host has a host-specific RSA key (normally 1024 bits) used to idenM-- tify the host. Additionally, when the daemon starts, it generates a server RSA key (normally 768 bits). This key is normally regenerated every hour if it has been used, and is never stored on disk. @@ -35,7 +35,7 @@ server. Both sides then use this random number as a session key which is used to encrypt all further communications in the session. The rest of the session is encrypted using a conventional cipher, currently Blowfish - or 3DES, with 3DES being used by default. The client selects the encryp- + or 3DES, with 3DES being used by default. The client selects the encrypM-- tion algorithm to use from those offered by the server. Next, the server and the client enter an authentication dialog. The @@ -45,7 +45,7 @@ Rhosts authentication is normally disabled because it is fundamentally insecure, but can be enabled in the server configuration file if desired. - System security is not improved unless rshd, rlogind, and rexecd are dis- + System security is not improved unless rshd, rlogind, and rexecd are disM-- abled (thus completely disabling rlogin and rsh into the machine). SSH protocol version 2 @@ -63,9 +63,9 @@ through a cryptographic message authentication code (hmac-sha1 or hmac- md5). - Protocol version 2 provides a public key based user (PubkeyAuthentica- + Protocol version 2 provides a public key based user (PubkeyAuthenticaM-- tion) or client host (HostbasedAuthentication) authentication method, - conventional password authentication and challenge response based meth- + conventional password authentication and challenge response based methM-- ods. Command execution and data forwarding @@ -81,12 +81,12 @@ data at any time, and such data is forwarded to/from the shell or command on the server side, and the user terminal in the client side. - When the user program terminates and all forwarded X11 and other connec- + When the user program terminates and all forwarded X11 and other connecM-- tions have been closed, the server sends command exit status to the client, and both sides exit. sshd can be configured using command-line options or a configuration - file. Command-line options override values specified in the configura- + file. Command-line options override values specified in the configuraM-- tion file. sshd rereads its configuration file when it receives a hangup signal, @@ -110,7 +110,7 @@ -f configuration_file Specifies the name of the configuration file. The default is - /etc/ssh/sshd_config. sshd refuses to start if there is no con- + /etc/ssh/sshd_config. sshd refuses to start if there is no conM-- figuration file. -g login_grace_time @@ -124,7 +124,7 @@ be given if sshd is not run as root (as the normal host key files are normally not readable by anyone but root). The default is /etc/ssh/ssh_host_key for protocol version 1, and - /etc/ssh/ssh_host_rsa_key and /etc/ssh/ssh_host_dsa_key for pro- + /etc/ssh/ssh_host_rsa_key and /etc/ssh/ssh_host_dsa_key for proM-- tocol version 2. It is possible to have multiple host key files for the different protocol versions and host key algorithms. @@ -137,7 +137,7 @@ -k key_gen_time Specifies how often the ephemeral protocol version 1 server key - is regenerated (default 3600 seconds, or one hour). The motiva- + is regenerated (default 3600 seconds, or one hour). The motivaM-- tion for regenerating the key fairly often is that the key is not stored anywhere, and after about an hour, it becomes impossible to recover the key for decrypting intercepted communications even @@ -145,13 +145,13 @@ zero indicates that the key will never be regenerated. -o option - Can be used to give options in the format used in the configura- + Can be used to give options in the format used in the configuraM-- tion file. This is useful for specifying options for which there is no separate command-line flag. -p port Specifies the port on which the server listens for connections - (default 22). Multiple port options are permitted. Ports speci- + (default 22). Multiple port options are permitted. Ports speciM-- fied in the configuration file are ignored when a command-line port is specified. @@ -166,7 +166,7 @@ -u len This option is used to specify the size of the field in the utmp structure that holds the remote host name. If the resolved host name is longer than len, the dotted decimal value will be used - instead. This allows hosts with very long host names that over- + instead. This allows hosts with very long host names that overM-- flow this field to still be uniquely identified. Specifying -u0 indicates that only dotted decimal addresses should be put into the utmp file. -u0 is also be used to prevent sshd from making @@ -186,11 +186,11 @@ CONFIGURATION FILE sshd reads configuration data from /etc/ssh/sshd_config (or the file - specified with -f on the command line). The file contains keyword-argu- + specified with -f on the command line). The file contains keyword-arguM-- ment pairs, one per line. Lines starting with `#' and empty lines are interpreted as comments. - The possible keywords and their meanings are as follows (note that key- + The possible keywords and their meanings are as follows (note that keyM-- words are case-insensitive and arguments are case-sensitive): AFSTokenPassing @@ -232,8 +232,8 @@ path or one relative to the user's home directory. The default is ``.ssh/authorized_keys''. - Banner In some jurisdictions, sending a warning message before authenti- - cation may be relevant for getting legal protection. The con- + Banner In some jurisdictions, sending a warning message before authentiM-- + cation may be relevant for getting legal protection. The conM-- tents of the specified file are sent to the remote user before authentication is allowed. This option is only available for protocol version 2. By default, no banner is displayed. @@ -267,7 +267,7 @@ are sent through the encrypted channel and therefore will not be spoofable. The TCP keepalive option enabled by KeepAlive is spoofable. The client alive mechanism is valuable when the client - or server depend on knowing when a connection has become inac- + or server depend on knowing when a connection has become inacM-- tive. The default value is 3. If ClientAliveInterval (above) is set to @@ -312,7 +312,7 @@ HostKey Specifies a file containing a private host key used by SSH. The default is /etc/ssh/ssh_host_key for protocol version 1, and - /etc/ssh/ssh_host_rsa_key and /etc/ssh/ssh_host_dsa_key for pro- + /etc/ssh/ssh_host_rsa_key and /etc/ssh/ssh_host_dsa_key for proM-- tocol version 2. Note that sshd will refuse to use a file if it is group/world-accessible. It is possible to have multiple host key files. ``rsa1'' keys are used for version 1 and ``dsa'' or @@ -335,7 +335,7 @@ Specifies whether the system should send TCP keepalive messages to the other side. If they are sent, death of the connection or crash of one of the machines will be properly noticed. However, - this means that connections will die if the route is down tem- + this means that connections will die if the route is down temM-- porarily, and some people find it annoying. On the other hand, if keepalives are not sent, sessions may hang indefinitely on the server, leaving ``ghost'' users and consuming server resources. @@ -351,7 +351,7 @@ be in the form of a Kerberos ticket, or if PasswordAuthentication is yes, the password provided by the user will be validated through the Kerberos KDC. To use this option, the server needs a - Kerberos servtab which allows the verification of the KDC's iden- + Kerberos servtab which allows the verification of the KDC's idenM-- tity. Default is ``no''. KerberosOrLocalPasswd @@ -371,13 +371,13 @@ KeyRegenerationInterval In protocol version 1, the ephemeral server key is automatically regenerated after this many seconds (if it has been used). The - purpose of regeneration is to prevent decrypting captured ses- + purpose of regeneration is to prevent decrypting captured sesM-- sions by later breaking into the machine and stealing the keys. The key is never stored anywhere. If the value is 0, the key is never regenerated. The default is 3600 (seconds). ListenAddress - Specifies the local addresses sshd should listen on. The follow- + Specifies the local addresses sshd should listen on. The followM-- ing forms may be used: ListenAddress host|IPv4_addr|IPv6_addr @@ -391,35 +391,35 @@ port qualified addresses. LoginGraceTime - The server disconnects after this time if the user has not suc- + The server disconnects after this time if the user has not sucM-- cessfully logged in. If the value is 0, there is no time limit. The default is 600 (seconds). LogLevel Gives the verbosity level that is used when logging messages from - sshd. The possible values are: QUIET, FATAL, ERROR, INFO, VER- + sshd. The possible values are: QUIET, FATAL, ERROR, INFO, VERM-- BOSE, DEBUG, DEBUG1, DEBUG2 and DEBUG3. The default is INFO. DEBUG and DEBUG1 are equivalent. DEBUG2 and DEBUG3 each specify higher levels of debugging output. Logging with a DEBUG level violates the privacy of users and is not recommended. - MACs Specifies the available MAC (message authentication code) algo- + MACs Specifies the available MAC (message authentication code) algoM-- rithms. The MAC algorithm is used in protocol version 2 for data - integrity protection. Multiple algorithms must be comma-sepa- + integrity protection. Multiple algorithms must be comma-sepaM-- rated. The default is ``hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96''. MaxStartups - Specifies the maximum number of concurrent unauthenticated con- + Specifies the maximum number of concurrent unauthenticated conM-- nections to the sshd daemon. Additional connections will be dropped until authentication succeeds or the LoginGraceTime expires for a connection. The default is 10. Alternatively, random early drop can be enabled by specifying the three colon separated values ``start:rate:full'' (e.g., - "10:30:60"). sshd will refuse connection attempts with a proba- + "10:30:60"). sshd will refuse connection attempts with a probaM-- bility of ``rate/100'' (30%) if there are currently ``start'' - (10) unauthenticated connections. The probability increases lin- + (10) unauthenticated connections. The probability increases linM-- early and all connection attempts are refused if the number of unauthenticated connections reaches ``full'' (60). @@ -444,7 +444,7 @@ be ``yes'', ``without-password'', ``forced-commands-only'' or ``no''. The default is ``yes''. - If this option is set to ``without-password'' password authenti- + If this option is set to ``without-password'' password authentiM-- cation is disabled for root. If this option is set to ``forced-commands-only'' root login with @@ -473,7 +473,7 @@ /etc/profile, or equivalent.) The default is ``yes''. Protocol - Specifies the protocol versions sshd should support. The possi- + Specifies the protocol versions sshd should support. The possiM-- ble values are ``1'' and ``2''. Multiple versions must be comma- separated. The default is ``2,1''. @@ -484,7 +484,7 @@ RhostsAuthentication Specifies whether authentication using rhosts or /etc/hosts.equiv - files is sufficient. Normally, this method should not be permit- + files is sufficient. Normally, this method should not be permitM-- ted because it is insecure. RhostsRSAAuthentication should be used instead, because it performs RSA-based host authentication in addition to normal rhosts or /etc/hosts.equiv authentication. @@ -528,7 +528,7 @@ default is AUTH. UseLogin - Specifies whether login(1) is used for interactive login ses- + Specifies whether login(1) is used for interactive login sesM-- sions. The default is ``no''. Note that login(1) is never used for remote command execution. Note also, that if this is enabled, X11Forwarding will be disabled because login(1) does not @@ -540,7 +540,7 @@ unprivileged child process to deal with incoming network traffic. After successful authentication, another process will be created that has the privilege of the authenticated user. The goal of - privilege separation is to prevent privilege escalation by con- + privilege separation is to prevent privilege escalation by conM-- taining any corruption within the unprivileged processes. The default is ``no''. @@ -550,14 +550,14 @@ maps back to the very same IP address. The default is ``no''. X11DisplayOffset - Specifies the first display number available for sshd's X11 for- + Specifies the first display number available for sshd's X11 forM-- warding. This prevents sshd from interfering with real X11 servers. The default is 10. X11Forwarding Specifies whether X11 forwarding is permitted. The default is ``no''. Note that disabling X11 forwarding does not improve - security in any way, as users can always install their own for- + security in any way, as users can always install their own forM-- warders. X11 forwarding is automatically disabled if UseLogin is enabled. @@ -569,7 +569,7 @@ ``localhost''. This prevents remote hosts from connecting to the fake display. However, some older X11 clients may not function with this configuration. X11UseLocalhost may be set to ``no'' to - specify that the forwarding server should be bound to the wild- + specify that the forwarding server should be bound to the wildM-- card address. The argument must be ``yes'' or ``no''. The default is ``yes''. @@ -581,7 +581,7 @@ sshd command-line arguments and configuration file options that specify time may be expressed using a sequence of the form: time[qualifier], - where time is a positive integer value and qualifier is one of the fol- + where time is a positive integer value and qualifier is one of the folM-- lowing: seconds @@ -605,7 +605,7 @@ 1. If the login is on a tty, and no command has been specified, prints last login time and /etc/motd (unless prevented in the - configuration file or by $HOME/.hushlogin; see the FILES sec- + configuration file or by $HOME/.hushlogin; see the FILES secM-- tion). 2. If the login is on a tty, records login time. @@ -637,11 +637,11 @@ Each line of the file contains one key (empty lines and lines starting with a `#' are ignored as comments). Each RSA public key consists of the following fields, separated by spaces: options, bits, exponent, modulus, - comment. Each protocol version 2 public key consists of: options, key- + comment. Each protocol version 2 public key consists of: options, keyM-- type, base64 encoded key, comment. The options fields are optional; its presence is determined by whether the line starts with a number or not - (the option field never starts with a number). The bits, exponent, modu- - lus and comment fields give the RSA key for protocol version 1; the com- + (the option field never starts with a number). The bits, exponent, moduM-- + lus and comment fields give the RSA key for protocol version 1; the comM-- ment field is not used for anything (but may be convenient for the user to identify the key). For protocol version 2 the keytype is ``ssh-dss'' or ``ssh-rsa''. @@ -654,8 +654,8 @@ sshd enforces a minimum RSA key modulus size for protocol 1 and protocol 2 keys of 768 bits. - The options (if present) consist of comma-separated option specifica- - tions. No spaces are permitted, except within double quotes. The fol- + The options (if present) consist of comma-separated option specificaM-- + tions. No spaces are permitted, except within double quotes. The folM-- lowing option specifications are supported (note that option keywords are case-insensitive): @@ -679,7 +679,7 @@ ignored. The command is run on a pty if the client requests a pty; otherwise it is run without a tty. If a 8-bit clean channel is required, one must not request a pty or should specify no-pty. - A quote may be included in the command by quoting it with a back- + A quote may be included in the command by quoting it with a backM-- slash. This option might be useful to restrict certain RSA keys to perform just a specific operation. An example might be a key that permits remote backups but nothing else. Note that the @@ -695,7 +695,7 @@ if UseLogin is enabled. no-port-forwarding - Forbids TCP/IP forwarding when this key is used for authentica- + Forbids TCP/IP forwarding when this key is used for authenticaM-- tion. Any port forward requests by the client will return an error. This might be used, e.g., in connection with the command option. @@ -711,8 +711,8 @@ no-pty Prevents tty allocation (a request to allocate a pty will fail). permitopen="host:port" - Limit local ``ssh -L'' port forwarding such that it may only con- - nect to the specified host and port. IPv6 addresses can be spec- + Limit local ``ssh -L'' port forwarding such that it may only conM-- + nect to the specified host and port. IPv6 addresses can be specM-- ified with an alternative syntax: host/port. Multiple permitopen options may be applied separated by commas. No pattern matching is performed on the specified hostnames, they must be literal @@ -738,7 +738,7 @@ Each line in these files contains the following fields: hostnames, bits, exponent, modulus, comment. The fields are separated by spaces. - Hostnames is a comma-separated list of patterns ('*' and '?' act as wild- + Hostnames is a comma-separated list of patterns ('*' and '?' act as wildM-- cards); each pattern in turn is matched against the canonical host name (when authenticating a client) or against the user-supplied name (when authenticating a server). A pattern may also be preceded by `'! to @@ -752,10 +752,10 @@ Lines starting with `#' and empty lines are ignored as comments. When performing host authentication, authentication is accepted if any - matching line has the proper key. It is thus permissible (but not recom- + matching line has the proper key. It is thus permissible (but not recomM-- mended) to have several lines or different host keys for the same names. This will inevitably happen when short forms of host names from different - domains are put in the file. It is possible that the files contain con- + domains are put in the file. It is possible that the files contain conM-- flicting information; authentication is accepted if valid information can be found from either file. @@ -772,7 +772,7 @@ FILES /etc/ssh/sshd_config Contains configuration data for sshd. This file should be - writable by root only, but it is recommended (though not neces- + writable by root only, but it is recommended (though not necesM-- sary) that it be world-readable. /etc/ssh/ssh_host_key, /etc/ssh/ssh_host_dsa_key, @@ -798,7 +798,7 @@ /var/run/sshd.pid Contains the process ID of the sshd listening for connections (if there are several daemons running concurrently for different - ports, this contains the pid of the one started last). The con- + ports, this contains the pid of the one started last). The conM-- tent of this file is not sensitive; it can be world-readable. $HOME/.ssh/authorized_keys @@ -812,7 +812,7 @@ as described in ssh-keygen(1). /etc/ssh/ssh_known_hosts and $HOME/.ssh/known_hosts - These files are consulted when using rhosts with RSA host authen- + These files are consulted when using rhosts with RSA host authenM-- tication or protocol version 2 hostbased authentication to check the public key of the host. The key must be listed in one of these files to be accepted. The client uses the same files to @@ -835,7 +835,7 @@ This file contains host-username pairs, separated by a space, one per line. The given user on the corresponding host is permitted to log in without password. The same file is used by rlogind and - rshd. The file must be writable only by the user; it is recom- + rshd. The file must be writable only by the user; it is recomM-- mended that it not be accessible by others. If is also possible to use netgroups in the file. Either host or @@ -887,7 +887,7 @@ $HOME/.ssh/rc If this file exists, it is run with /bin/sh after reading the - environment files but before starting the user's shell or com- + environment files but before starting the user's shell or comM-- mand. It must not produce any output on stdout; stderr must be used instead. If X11 forwarding is in use, it will receive the "proto cookie" pair in its standard input (and DISPLAY in its @@ -896,7 +896,7 @@ The primary purpose of this file is to run any initialization routines which may be needed before the user's home directory - becomes accessible; AFS is a particular example of such an envi- + becomes accessible; AFS is a particular example of such an enviM-- ronment. This file will probably contain some initialization code followed @@ -927,7 +927,7 @@ AUTHORS OpenSSH is a derivative of the original and free ssh 1.2.12 release by Tatu Ylonen. Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo - de Raadt and Dug Song removed many bugs, re-added newer features and cre- + de Raadt and Dug Song removed many bugs, re-added newer features and creM-- ated OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support for privilege separation. diff -ru openssh-3.2.2p1/sshd.c openssh-3.2.3p1/sshd.c --- openssh-3.2.2p1/sshd.c 2002-05-16 02:25:02.000000000 +1000 +++ openssh-3.2.3p1/sshd.c 2002-05-22 03:59:13.000000000 +1000 @@ -1005,6 +1005,7 @@ if (test_flag) exit(0); +#ifndef HAVE_CYGWIN /* * Clear out any supplemental groups we may have inherited. This * prevents inadvertent creation of files with bad modes (in the @@ -1014,6 +1015,7 @@ */ if (setgroups(0, NULL) < 0) debug("setgroups() failed: %.200s", strerror(errno)); +#endif /* !HAVE_CYGWIN */ /* Initialize the log (it is reinitialized below in case we forked). */ if (debug_flag && !inetd_flag) @@ -1336,8 +1338,11 @@ * setlogin() affects the entire process group. We don't * want the child to be able to affect the parent. */ +#if 0 + /* XXX: this breaks Solaris */ if (setsid() < 0) error("setsid: %.100s", strerror(errno)); +#endif /* * Disable the key regeneration alarm. We will not regenerate the diff -ru openssh-3.2.2p1/version.h openssh-3.2.3p1/version.h --- openssh-3.2.2p1/version.h 2002-05-16 09:25:38.000000000 +1000 +++ openssh-3.2.3p1/version.h 2002-05-22 14:14:01.000000000 +1000 @@ -1,3 +1,3 @@ -/* $OpenBSD: version.h,v 1.31 2002/05/15 21:05:29 markus Exp $ */ +/* $OpenBSD: version.h,v 1.32 2002/05/17 14:57:40 markus Exp $ */ -#define SSH_VERSION "OpenSSH_3.2.2p1" +#define SSH_VERSION "OpenSSH_3.2.3p1"