Tim Rice | bdd3e67 | 2010-10-24 18:35:55 -0700 | [diff] [blame] | 1 | 20101025 |
| 2 | - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with |
| 3 | 1.12 to unbreak Solaris build. |
| 4 | ok djm@ |
Darren Tucker | 54b1f31 | 2010-10-25 16:54:28 +1100 | [diff] [blame^] | 5 | - (dtucker) [defines.h] Use SIZE_T_MAX for SIZE_MAX for platforms that have a |
| 6 | native one. |
Tim Rice | bdd3e67 | 2010-10-24 18:35:55 -0700 | [diff] [blame] | 7 | |
Darren Tucker | a539393 | 2010-10-24 10:47:30 +1100 | [diff] [blame] | 8 | 20101024 |
| 9 | - (dtucker) [includes.h] Add missing ifdef GLOB_HAS_GL_STATV to fix build. |
Darren Tucker | bfd9b1b | 2010-10-24 11:19:26 +1100 | [diff] [blame] | 10 | - (dtucker) [regress/cert-hostkey.sh] Disable ECC-based tests on platforms |
| 11 | which don't have ECC support in libcrypto. |
Darren Tucker | d633fef | 2010-10-24 11:33:07 +1100 | [diff] [blame] | 12 | - (dtucker) [regress/cert-userkey.sh] Disable ECC-based tests on platforms |
| 13 | which don't have ECC support in libcrypto. |
Darren Tucker | 7bc236d | 2010-10-24 11:58:43 +1100 | [diff] [blame] | 14 | - (dtucker) [defines.h] Add SIZE_MAX for the benefit of platforms that don't |
| 15 | have it. |
Darren Tucker | d78739a | 2010-10-24 10:56:32 +1100 | [diff] [blame] | 16 | - (dtucker) OpenBSD CVS Sync |
| 17 | - sthen@cvs.openbsd.org 2010/10/23 22:06:12 |
| 18 | [sftp.c] |
| 19 | escape '[' in filename tab-completion; fix a type while there. |
| 20 | ok djm@ |
Darren Tucker | a539393 | 2010-10-24 10:47:30 +1100 | [diff] [blame] | 21 | |
Damien Miller | 68512c0 | 2010-10-21 15:21:11 +1100 | [diff] [blame] | 22 | 20101021 |
| 23 | - OpenBSD CVS Sync |
| 24 | - dtucker@cvs.openbsd.org 2010/10/12 02:22:24 |
| 25 | [mux.c] |
| 26 | Typo in confirmation message. bz#1827, patch from imorgan at |
| 27 | nas nasa gov |
Damien Miller | 6fd2d7d | 2010-10-21 15:27:14 +1100 | [diff] [blame] | 28 | - djm@cvs.openbsd.org 2010/08/31 12:24:09 |
| 29 | [regress/cert-hostkey.sh regress/cert-userkey.sh] |
| 30 | tests for ECDSA certificates |
Damien Miller | 68512c0 | 2010-10-21 15:21:11 +1100 | [diff] [blame] | 31 | |
Damien Miller | 1f78980 | 2010-10-11 22:35:22 +1100 | [diff] [blame] | 32 | 20101011 |
Damien Miller | 47e57bf | 2010-10-12 13:28:12 +1100 | [diff] [blame] | 33 | - (djm) [canohost.c] Zero a4 instead of addr to better match type. |
| 34 | bz#1825, reported by foo AT mailinator.com |
Damien Miller | 9c0c31d | 2010-10-12 13:30:44 +1100 | [diff] [blame] | 35 | - (djm) [sshconnect.c] Need signal.h for prototype for kill(2) |
Damien Miller | 47e57bf | 2010-10-12 13:28:12 +1100 | [diff] [blame] | 36 | |
| 37 | 20101011 |
Damien Miller | 1f78980 | 2010-10-11 22:35:22 +1100 | [diff] [blame] | 38 | - (djm) [configure.ac] Use = instead of == in shell tests. Patch from |
| 39 | dr AT vasco.com |
| 40 | |
Damien Miller | aa18063 | 2010-10-07 21:25:27 +1100 | [diff] [blame] | 41 | 20101007 |
Damien Miller | 9a3d0dc | 2010-10-07 22:06:42 +1100 | [diff] [blame] | 42 | - (djm) [ssh-agent.c] Fix type for curve name. |
Damien Miller | aa18063 | 2010-10-07 21:25:27 +1100 | [diff] [blame] | 43 | - (djm) OpenBSD CVS Sync |
| 44 | - matthew@cvs.openbsd.org 2010/09/24 13:33:00 |
| 45 | [misc.c misc.h configure.ac openbsd-compat/openbsd-compat.h] |
| 46 | [openbsd-compat/timingsafe_bcmp.c] |
| 47 | Add timingsafe_bcmp(3) to libc, mention that it's already in the |
| 48 | kernel in kern(9), and remove it from OpenSSH. |
| 49 | ok deraadt@, djm@ |
| 50 | NB. re-added under openbsd-compat/ for portable OpenSSH |
Damien Miller | a6e121a | 2010-10-07 21:39:17 +1100 | [diff] [blame] | 51 | - djm@cvs.openbsd.org 2010/09/25 09:30:16 |
| 52 | [sftp.c configure.ac openbsd-compat/glob.c openbsd-compat/glob.h] |
| 53 | make use of new glob(3) GLOB_KEEPSTAT extension to save extra server |
| 54 | rountrips to fetch per-file stat(2) information. |
| 55 | NB. update openbsd-compat/ glob(3) implementation from OpenBSD libc to |
| 56 | match. |
Damien Miller | 68e2e56 | 2010-10-07 21:39:55 +1100 | [diff] [blame] | 57 | - djm@cvs.openbsd.org 2010/09/26 22:26:33 |
| 58 | [sftp.c] |
| 59 | when performing an "ls" in columnated (short) mode, only call |
| 60 | ioctl(TIOCGWINSZ) once to get the window width instead of per- |
| 61 | filename |
Damien Miller | c54b02c | 2010-10-07 21:40:17 +1100 | [diff] [blame] | 62 | - djm@cvs.openbsd.org 2010/09/30 11:04:51 |
| 63 | [servconf.c] |
| 64 | prevent free() of string in .rodata when overriding AuthorizedKeys in |
| 65 | a Match block; patch from rein AT basefarm.no |
Damien Miller | 9a3d0dc | 2010-10-07 22:06:42 +1100 | [diff] [blame] | 66 | - djm@cvs.openbsd.org 2010/10/01 23:05:32 |
| 67 | [cipher-3des1.c cipher-bf1.c cipher-ctr.c openbsd-compat/openssl-compat.h] |
| 68 | adapt to API changes in openssl-1.0.0a |
| 69 | NB. contains compat code to select correct API for older OpenSSL |
Damien Miller | 38d9a96 | 2010-10-07 22:07:11 +1100 | [diff] [blame] | 70 | - djm@cvs.openbsd.org 2010/10/05 05:13:18 |
| 71 | [sftp.c sshconnect.c] |
| 72 | use default shell /bin/sh if $SHELL is ""; ok markus@ |
Damien Miller | a41ccca | 2010-10-07 22:07:32 +1100 | [diff] [blame] | 73 | - djm@cvs.openbsd.org 2010/10/06 06:39:28 |
| 74 | [clientloop.c ssh.c sshconnect.c sshconnect.h] |
| 75 | kill proxy command on fatal() (we already kill it on clean exit); |
| 76 | ok markus@ |
Damien Miller | 45fcdaa | 2010-10-07 22:07:58 +1100 | [diff] [blame] | 77 | - djm@cvs.openbsd.org 2010/10/06 21:10:21 |
| 78 | [sshconnect.c] |
| 79 | swapped args to kill(2) |
Damien Miller | 37f4f18 | 2010-10-07 22:10:38 +1100 | [diff] [blame] | 80 | - (djm) [openbsd-compat/glob.c] restore ARG_MAX compat code. |
Damien Miller | 80e9953 | 2010-10-07 22:12:08 +1100 | [diff] [blame] | 81 | - (djm) [cipher-acss.c] Add missing header. |
Damien Miller | 88b844f | 2010-10-07 22:19:23 +1100 | [diff] [blame] | 82 | - (djm) [openbsd-compat/Makefile.in] Actually link timingsafe_bcmp |
Damien Miller | aa18063 | 2010-10-07 21:25:27 +1100 | [diff] [blame] | 83 | |
Damien Miller | 6186bbc | 2010-09-24 22:00:54 +1000 | [diff] [blame] | 84 | 20100924 |
| 85 | - (djm) OpenBSD CVS Sync |
| 86 | - naddy@cvs.openbsd.org 2010/09/10 15:19:29 |
| 87 | [ssh-keygen.1] |
| 88 | * mention ECDSA in more places |
| 89 | * less repetition in FILES section |
| 90 | * SSHv1 keys are still encrypted with 3DES |
| 91 | help and ok jmc@ |
Damien Miller | 1ca9469 | 2010-09-24 22:01:22 +1000 | [diff] [blame] | 92 | - djm@cvs.openbsd.org 2010/09/11 21:44:20 |
| 93 | [ssh.1] |
| 94 | mention RFC 5656 for ECC stuff |
Damien Miller | 881adf7 | 2010-09-24 22:01:54 +1000 | [diff] [blame] | 95 | - jmc@cvs.openbsd.org 2010/09/19 21:30:05 |
| 96 | [sftp.1] |
| 97 | more wacky macro fixing; |
Damien Miller | 857b02e | 2010-09-24 22:02:56 +1000 | [diff] [blame] | 98 | - djm@cvs.openbsd.org 2010/09/20 04:41:47 |
| 99 | [ssh.c] |
| 100 | install a SIGCHLD handler to reap expiried child process; ok markus@ |
Damien Miller | f7540cd | 2010-09-24 22:03:24 +1000 | [diff] [blame] | 101 | - djm@cvs.openbsd.org 2010/09/20 04:50:53 |
| 102 | [jpake.c schnorr.c] |
| 103 | check that received values are smaller than the group size in the |
| 104 | disabled and unfinished J-PAKE code. |
| 105 | avoids catastrophic security failure found by Sebastien Martini |
Damien Miller | 18e1cab | 2010-09-24 22:07:17 +1000 | [diff] [blame] | 106 | - djm@cvs.openbsd.org 2010/09/20 04:54:07 |
| 107 | [jpake.c] |
| 108 | missing #include |
Damien Miller | 603134e | 2010-09-24 22:07:55 +1000 | [diff] [blame] | 109 | - djm@cvs.openbsd.org 2010/09/20 07:19:27 |
| 110 | [mux.c] |
| 111 | "atomically" create the listening mux socket by binding it on a temorary |
| 112 | name and then linking it into position after listen() has succeeded. |
| 113 | this allows the mux clients to determine that the server socket is |
| 114 | either ready or stale without races. stale server sockets are now |
| 115 | automatically removed |
| 116 | ok deraadt |
Damien Miller | d5f62bf | 2010-09-24 22:11:14 +1000 | [diff] [blame] | 117 | - djm@cvs.openbsd.org 2010/09/22 05:01:30 |
| 118 | [kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c readconf.c readconf.h] |
| 119 | [servconf.c servconf.h ssh_config.5 sshconnect2.c sshd.c sshd_config.5] |
| 120 | add a KexAlgorithms knob to the client and server configuration to allow |
| 121 | selection of which key exchange methods are used by ssh(1) and sshd(8) |
| 122 | and their order of preference. |
| 123 | ok markus@ |
Damien Miller | 7fe2b1f | 2010-09-24 22:11:53 +1000 | [diff] [blame] | 124 | - jmc@cvs.openbsd.org 2010/09/22 08:30:08 |
| 125 | [ssh.1 ssh_config.5] |
| 126 | ssh.1: add kexalgorithms to the -o list |
| 127 | ssh_config.5: format the kexalgorithms in a more consistent |
| 128 | (prettier!) way |
| 129 | ok djm |
Damien Miller | 65e42f8 | 2010-09-24 22:15:11 +1000 | [diff] [blame] | 130 | - djm@cvs.openbsd.org 2010/09/22 22:58:51 |
| 131 | [atomicio.c atomicio.h misc.c misc.h scp.c sftp-client.c] |
| 132 | [sftp-client.h sftp.1 sftp.c] |
| 133 | add an option per-read/write callback to atomicio |
| 134 | |
| 135 | factor out bandwidth limiting code from scp(1) into a generic bandwidth |
| 136 | limiter that can be attached using the atomicio callback mechanism |
| 137 | |
| 138 | add a bandwidth limit option to sftp(1) using the above |
| 139 | "very nice" markus@ |
Damien Miller | 56883e1 | 2010-09-24 22:15:39 +1000 | [diff] [blame] | 140 | - jmc@cvs.openbsd.org 2010/09/23 13:34:43 |
| 141 | [sftp.c] |
| 142 | add [-l limit] to usage(); |
Damien Miller | 2beb32f | 2010-09-24 22:16:03 +1000 | [diff] [blame] | 143 | - jmc@cvs.openbsd.org 2010/09/23 13:36:46 |
| 144 | [scp.1 sftp.1] |
| 145 | add KexAlgorithms to the -o list; |
Damien Miller | 6186bbc | 2010-09-24 22:00:54 +1000 | [diff] [blame] | 146 | |
Damien Miller | 4314c2b | 2010-09-10 11:12:09 +1000 | [diff] [blame] | 147 | 20100910 |
Darren Tucker | 50e3bab | 2010-09-10 10:30:25 +1000 | [diff] [blame] | 148 | - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact |
| 149 | return code since it can apparently return -1 under some conditions. From |
| 150 | openssh bugs werbittewas de, ok djm@ |
Damien Miller | 4314c2b | 2010-09-10 11:12:09 +1000 | [diff] [blame] | 151 | - OpenBSD CVS Sync |
| 152 | - djm@cvs.openbsd.org 2010/08/31 12:33:38 |
| 153 | [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c] |
| 154 | reintroduce commit from tedu@, which I pulled out for release |
| 155 | engineering: |
| 156 | OpenSSL_add_all_algorithms is the name of the function we have a |
| 157 | man page for, so use that. ok djm |
Damien Miller | de735ea | 2010-09-10 11:12:38 +1000 | [diff] [blame] | 158 | - jmc@cvs.openbsd.org 2010/08/31 17:40:54 |
| 159 | [ssh-agent.1] |
| 160 | fix some macro abuse; |
Damien Miller | d442790 | 2010-09-10 11:15:10 +1000 | [diff] [blame] | 161 | - jmc@cvs.openbsd.org 2010/08/31 21:14:58 |
| 162 | [ssh.1] |
| 163 | small text tweak to accommodate previous; |
Damien Miller | e13cadf | 2010-09-10 11:15:33 +1000 | [diff] [blame] | 164 | - naddy@cvs.openbsd.org 2010/09/01 15:21:35 |
| 165 | [servconf.c] |
| 166 | pick up ECDSA host key by default; ok djm@ |
Damien Miller | 390f153 | 2010-09-10 11:17:54 +1000 | [diff] [blame] | 167 | - markus@cvs.openbsd.org 2010/09/02 16:07:25 |
Damien Miller | 5773794 | 2010-09-10 11:16:37 +1000 | [diff] [blame] | 168 | [ssh-keygen.c] |
| 169 | permit -b 256, 384 or 521 as key size for ECDSA; ok djm@ |
Damien Miller | 390f153 | 2010-09-10 11:17:54 +1000 | [diff] [blame] | 170 | - markus@cvs.openbsd.org 2010/09/02 16:08:39 |
Damien Miller | 5929c52 | 2010-09-10 11:17:02 +1000 | [diff] [blame] | 171 | [ssh.c] |
| 172 | unbreak ControlPersist=yes for ControlMaster=yes; ok djm@ |
Damien Miller | 6e9f680 | 2010-09-10 11:17:38 +1000 | [diff] [blame] | 173 | - naddy@cvs.openbsd.org 2010/09/02 17:21:50 |
| 174 | [ssh-keygen.c] |
| 175 | Switch ECDSA default key size to 256 bits, which according to RFC5656 |
| 176 | should still be better than our current RSA-2048 default. |
| 177 | ok djm@, markus@ |
Damien Miller | 390f153 | 2010-09-10 11:17:54 +1000 | [diff] [blame] | 178 | - jmc@cvs.openbsd.org 2010/09/03 11:09:29 |
| 179 | [scp.1] |
| 180 | add an EXIT STATUS section for /usr/bin; |
Damien Miller | daa7b22 | 2010-09-10 11:19:33 +1000 | [diff] [blame] | 181 | - jmc@cvs.openbsd.org 2010/09/04 09:38:34 |
| 182 | [ssh-add.1 ssh.1] |
| 183 | two more EXIT STATUS sections; |
Damien Miller | 80ed82a | 2010-09-10 11:20:11 +1000 | [diff] [blame] | 184 | - naddy@cvs.openbsd.org 2010/09/06 17:10:19 |
| 185 | [sshd_config] |
| 186 | add ssh_host_ecdsa_key to /etc; from Mattieu Baptiste |
| 187 | <mattieu.b@gmail.com> |
| 188 | ok deraadt@ |
Damien Miller | bf0423e | 2010-09-10 11:20:38 +1000 | [diff] [blame] | 189 | - djm@cvs.openbsd.org 2010/09/08 03:54:36 |
| 190 | [authfile.c] |
| 191 | typo |
Damien Miller | 3796ab4 | 2010-09-10 11:20:59 +1000 | [diff] [blame] | 192 | - deraadt@cvs.openbsd.org 2010/09/08 04:13:31 |
| 193 | [compress.c] |
| 194 | work around name-space collisions some buggy compilers (looking at you |
| 195 | gcc, at least in earlier versions, but this does not forgive your current |
| 196 | transgressions) seen between zlib and openssl |
| 197 | ok djm |
Damien Miller | 041ab7c | 2010-09-10 11:23:34 +1000 | [diff] [blame] | 198 | - djm@cvs.openbsd.org 2010/09/09 10:45:45 |
| 199 | [kex.c kex.h kexecdh.c key.c key.h monitor.c ssh-ecdsa.c] |
| 200 | ECDH/ECDSA compliance fix: these methods vary the hash function they use |
| 201 | (SHA256/384/512) depending on the length of the curve in use. The previous |
| 202 | code incorrectly used SHA256 in all cases. |
| 203 | |
| 204 | This fix will cause authentication failure when using 384 or 521-bit curve |
| 205 | keys if one peer hasn't been upgraded and the other has. (256-bit curve |
| 206 | keys work ok). In particular you may need to specify HostkeyAlgorithms |
| 207 | when connecting to a server that has not been upgraded from an upgraded |
| 208 | client. |
| 209 | |
| 210 | ok naddy@ |
Damien Miller | 6af914a | 2010-09-10 11:39:26 +1000 | [diff] [blame] | 211 | - (djm) [authfd.c authfile.c bufec.c buffer.h configure.ac kex.h kexecdh.c] |
| 212 | [kexecdhc.c kexecdhs.c key.c key.h myproposal.h packet.c readconf.c] |
| 213 | [ssh-agent.c ssh-ecdsa.c ssh-keygen.c ssh.c] Disable ECDH and ECDSA on |
| 214 | platforms that don't have the requisite OpenSSL support. ok dtucker@ |
Darren Tucker | 8ccb739 | 2010-09-10 12:28:24 +1000 | [diff] [blame] | 215 | - (dtucker) [kex.h key.c packet.h ssh-agent.c ssh.c] A few more ECC ifdefs |
| 216 | for missing headers and compiler warnings. |
Darren Tucker | 50e3bab | 2010-09-10 10:30:25 +1000 | [diff] [blame] | 217 | |
| 218 | 20100831 |
Damien Miller | afdae61 | 2010-08-31 22:31:14 +1000 | [diff] [blame] | 219 | - OpenBSD CVS Sync |
| 220 | - jmc@cvs.openbsd.org 2010/08/08 19:36:30 |
| 221 | [ssh-keysign.8 ssh.1 sshd.8] |
| 222 | use the same template for all FILES sections; i.e. -compact/.Pp where we |
| 223 | have multiple items, and .Pa for path names; |
Damien Miller | 9b87e79 | 2010-08-31 22:31:37 +1000 | [diff] [blame] | 224 | - tedu@cvs.openbsd.org 2010/08/12 23:34:39 |
| 225 | [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c] |
| 226 | OpenSSL_add_all_algorithms is the name of the function we have a man page |
| 227 | for, so use that. ok djm |
Damien Miller | d96546f | 2010-08-31 22:32:12 +1000 | [diff] [blame] | 228 | - djm@cvs.openbsd.org 2010/08/16 04:06:06 |
| 229 | [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c] |
| 230 | backout previous temporarily; discussed with deraadt@ |
Damien Miller | da108ec | 2010-08-31 22:36:39 +1000 | [diff] [blame] | 231 | - djm@cvs.openbsd.org 2010/08/31 09:58:37 |
| 232 | [auth-options.c auth1.c auth2.c bufaux.c buffer.h kex.c key.c packet.c] |
| 233 | [packet.h ssh-dss.c ssh-rsa.c] |
| 234 | Add buffer_get_cstring() and related functions that verify that the |
| 235 | string extracted from the buffer contains no embedded \0 characters* |
| 236 | This prevents random (possibly malicious) crap from being appended to |
| 237 | strings where it would not be noticed if the string is used with |
| 238 | a string(3) function. |
| 239 | |
| 240 | Use the new API in a few sensitive places. |
| 241 | |
| 242 | * actually, we allow a single one at the end of the string for now because |
| 243 | we don't know how many deployed implementations get this wrong, but don't |
| 244 | count on this to remain indefinitely. |
Damien Miller | eb8b60e | 2010-08-31 22:41:14 +1000 | [diff] [blame] | 245 | - djm@cvs.openbsd.org 2010/08/31 11:54:45 |
| 246 | [PROTOCOL PROTOCOL.agent PROTOCOL.certkeys auth2-jpake.c authfd.c] |
| 247 | [authfile.c buffer.h dns.c kex.c kex.h key.c key.h monitor.c] |
| 248 | [monitor_wrap.c myproposal.h packet.c packet.h pathnames.h readconf.c] |
| 249 | [ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c] |
| 250 | [ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh.1 ssh.c ssh2.h] |
| 251 | [ssh_config.5 sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5] |
| 252 | [uuencode.c uuencode.h bufec.c kexecdh.c kexecdhc.c kexecdhs.c ssh-ecdsa.c] |
| 253 | Implement Elliptic Curve Cryptography modes for key exchange (ECDH) and |
| 254 | host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA offer |
| 255 | better performance than plain DH and DSA at the same equivalent symmetric |
| 256 | key length, as well as much shorter keys. |
| 257 | |
| 258 | Only the mandatory sections of RFC5656 are implemented, specifically the |
| 259 | three REQUIRED curves nistp256, nistp384 and nistp521 and only ECDH and |
| 260 | ECDSA. Point compression (optional in RFC5656 is NOT implemented). |
| 261 | |
| 262 | Certificate host and user keys using the new ECDSA key types are supported. |
| 263 | |
| 264 | Note that this code has not been tested for interoperability and may be |
| 265 | subject to change. |
| 266 | |
| 267 | feedback and ok markus@ |
Damien Miller | b5a62d0 | 2010-08-31 22:47:15 +1000 | [diff] [blame] | 268 | - (djm) [Makefile.in] Add new ECC files |
Damien Miller | c79ff07 | 2010-08-31 22:50:48 +1000 | [diff] [blame] | 269 | - (djm) [bufec.c kexecdh.c kexecdhc.c kexecdhs.c ssh-ecdsa.c] include |
| 270 | includes.h |
Damien Miller | afdae61 | 2010-08-31 22:31:14 +1000 | [diff] [blame] | 271 | |
Darren Tucker | 6889abd | 2010-08-27 10:12:54 +1000 | [diff] [blame] | 272 | 20100827 |
| 273 | - (dtucker) [contrib/redhat/sshd.init] Bug #1810: initlog is deprecated, |
| 274 | remove. Patch from martynas at venck us |
| 275 | |
Damien Miller | a536202 | 2010-08-23 21:20:20 +1000 | [diff] [blame] | 276 | 20100823 |
| 277 | - (djm) Release OpenSSH-5.6p1 |
| 278 | |
Darren Tucker | aa74f67 | 2010-08-16 13:15:23 +1000 | [diff] [blame] | 279 | 20100816 |
| 280 | - (dtucker) [configure.ac openbsd-compat/Makefile.in |
| 281 | openbsd-compat/openbsd-compat.h openbsd-compat/strptime.c] Add strptime to |
| 282 | the compat library which helps on platforms like old IRIX. Based on work |
| 283 | by djm, tested by Tom Christensen. |
Damien Miller | 00d9ae2 | 2010-08-17 01:59:31 +1000 | [diff] [blame] | 284 | - OpenBSD CVS Sync |
| 285 | - djm@cvs.openbsd.org 2010/08/12 21:49:44 |
| 286 | [ssh.c] |
| 287 | close any extra file descriptors inherited from parent at start and |
| 288 | reopen stdin/stdout to /dev/null when forking for ControlPersist. |
| 289 | |
| 290 | prevents tools that fork and run a captive ssh for communication from |
| 291 | failing to exit when the ssh completes while they wait for these fds to |
| 292 | close. The inherited fds may persist arbitrarily long if a background |
| 293 | mux master has been started by ControlPersist. cvs and scp were effected |
| 294 | by this. |
| 295 | |
| 296 | "please commit" markus@ |
Damien Miller | 07ad389 | 2010-08-17 07:04:28 +1000 | [diff] [blame] | 297 | - (djm) [regress/README.regress] typo |
Darren Tucker | aa74f67 | 2010-08-16 13:15:23 +1000 | [diff] [blame] | 298 | |
Tim Rice | 722b8d1 | 2010-08-12 09:43:13 -0700 | [diff] [blame] | 299 | 20100812 |
| 300 | - (tim) [regress/login-timeout.sh regress/reconfigure.sh regress/reexec.sh |
| 301 | regress/test-exec.sh] Under certain conditions when testing with sudo |
| 302 | tests would fail because the pidfile could not be read by a regular user. |
| 303 | "cat: cannot open ...../regress/pidfile: Permission denied (error 13)" |
| 304 | Make sure cat is run by $SUDO. no objection from me. djm@ |
Tim Rice | ad7d547 | 2010-08-12 10:33:01 -0700 | [diff] [blame] | 305 | - (tim) [auth.c] add cast to quiet compiler. Change only affects SVR5 systems. |
Tim Rice | 722b8d1 | 2010-08-12 09:43:13 -0700 | [diff] [blame] | 306 | |
Damien Miller | 7e569b8 | 2010-08-09 02:28:37 +1000 | [diff] [blame] | 307 | 20100809 |
Damien Miller | 2c4b13a | 2010-08-10 12:47:40 +1000 | [diff] [blame] | 308 | - (djm) bz#1561: don't bother setting IFF_UP on tun(4) device if it is |
| 309 | already set. Makes FreeBSD user openable tunnels useful; patch from |
| 310 | richard.burakowski+ossh AT mrburak.net, ok dtucker@ |
Darren Tucker | 02c4734 | 2010-08-10 13:36:09 +1000 | [diff] [blame] | 311 | - (dtucker) bug #1530: strip trailing ":" from hostname in ssh-copy-id. |
| 312 | based in part on a patch from Colin Watson, ok djm@ |
Damien Miller | 2c4b13a | 2010-08-10 12:47:40 +1000 | [diff] [blame] | 313 | |
| 314 | 20100809 |
Damien Miller | 7e569b8 | 2010-08-09 02:28:37 +1000 | [diff] [blame] | 315 | - OpenBSD CVS Sync |
| 316 | - djm@cvs.openbsd.org 2010/08/08 16:26:42 |
| 317 | [version.h] |
| 318 | crank to 5.6 |
Damien Miller | 792010b | 2010-08-09 02:32:05 +1000 | [diff] [blame] | 319 | - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
| 320 | [contrib/suse/openssh.spec] Crank version numbers |
Damien Miller | 7e569b8 | 2010-08-09 02:28:37 +1000 | [diff] [blame] | 321 | |
Damien Miller | 8e604ac | 2010-08-09 02:28:10 +1000 | [diff] [blame] | 322 | 20100805 |
Damien Miller | 7fa9660 | 2010-08-05 13:03:13 +1000 | [diff] [blame] | 323 | - OpenBSD CVS Sync |
| 324 | - djm@cvs.openbsd.org 2010/08/04 05:37:01 |
| 325 | [ssh.1 ssh_config.5 sshd.8] |
| 326 | Remove mentions of weird "addr/port" alternate address format for IPv6 |
| 327 | addresses combinations. It hasn't worked for ages and we have supported |
| 328 | the more commen "[addr]:port" format for a long time. ok jmc@ markus@ |
Damien Miller | 1da6388 | 2010-08-05 13:03:51 +1000 | [diff] [blame] | 329 | - djm@cvs.openbsd.org 2010/08/04 05:40:39 |
| 330 | [PROTOCOL.certkeys ssh-keygen.c] |
| 331 | tighten the rules for certificate encoding by requiring that options |
| 332 | appear in lexical order and make our ssh-keygen comply. ok markus@ |
Damien Miller | c158331 | 2010-08-05 13:04:50 +1000 | [diff] [blame] | 333 | - djm@cvs.openbsd.org 2010/08/04 05:42:47 |
| 334 | [auth.c auth2-hostbased.c authfile.c authfile.h ssh-keysign.8] |
| 335 | [ssh-keysign.c ssh.c] |
| 336 | enable certificates for hostbased authentication, from Iain Morgan; |
| 337 | "looks ok" markus@ |
Damien Miller | 5458c4d | 2010-08-05 13:05:15 +1000 | [diff] [blame] | 338 | - djm@cvs.openbsd.org 2010/08/04 05:49:22 |
| 339 | [authfile.c] |
| 340 | commited the wrong version of the hostbased certificate diff; this |
| 341 | version replaces some strlc{py,at} verbosity with xasprintf() at |
| 342 | the request of markus@ |
Damien Miller | 757f34e | 2010-08-05 13:05:31 +1000 | [diff] [blame] | 343 | - djm@cvs.openbsd.org 2010/08/04 06:07:11 |
| 344 | [ssh-keygen.1 ssh-keygen.c] |
| 345 | Support CA keys in PKCS#11 tokens; feedback and ok markus@ |
Damien Miller | b89e6b7 | 2010-08-05 13:06:20 +1000 | [diff] [blame] | 346 | - djm@cvs.openbsd.org 2010/08/04 06:08:40 |
| 347 | [ssh-keysign.c] |
| 348 | clean for -Wuninitialized (Id sync only; portable had this change) |
Damien Miller | 7d45718 | 2010-08-05 23:09:48 +1000 | [diff] [blame] | 349 | - djm@cvs.openbsd.org 2010/08/05 13:08:42 |
| 350 | [channels.c] |
| 351 | Fix a trio of bugs in the local/remote window calculation for datagram |
| 352 | data channels (i.e. TunnelForward): |
| 353 | |
| 354 | Calculate local_consumed correctly in channel_handle_wfd() by measuring |
| 355 | the delta to buffer_len(c->output) from when we start to when we finish. |
| 356 | The proximal problem here is that the output_filter we use in portable |
| 357 | modified the length of the dequeued datagram (to futz with the headers |
| 358 | for !OpenBSD). |
| 359 | |
| 360 | In channel_output_poll(), don't enqueue datagrams that won't fit in the |
| 361 | peer's advertised packet size (highly unlikely to ever occur) or which |
| 362 | won't fit in the peer's remaining window (more likely). |
| 363 | |
| 364 | In channel_input_data(), account for the 4-byte string header in |
| 365 | datagram packets that we accept from the peer and enqueue in c->output. |
| 366 | |
| 367 | report, analysis and testing 2/3 cases from wierbows AT us.ibm.com; |
| 368 | "looks good" markus@ |
Damien Miller | 7fa9660 | 2010-08-05 13:03:13 +1000 | [diff] [blame] | 369 | |
Damien Miller | 8e604ac | 2010-08-09 02:28:10 +1000 | [diff] [blame] | 370 | 20100803 |
Darren Tucker | 8b7a055 | 2010-08-03 15:50:16 +1000 | [diff] [blame] | 371 | - (dtucker) [monitor.c] Bug #1795: Initialize the values to be returned from |
| 372 | PAM to sane values in case the PAM method doesn't write to them. Spotted by |
| 373 | Bitman Zhou, ok djm@. |
Damien Miller | 844cccf | 2010-08-03 16:03:29 +1000 | [diff] [blame] | 374 | - OpenBSD CVS Sync |
| 375 | - djm@cvs.openbsd.org 2010/07/16 04:45:30 |
| 376 | [ssh-keygen.c] |
| 377 | avoid bogus compiler warning |
Damien Miller | 4e8285e | 2010-08-03 16:04:03 +1000 | [diff] [blame] | 378 | - djm@cvs.openbsd.org 2010/07/16 14:07:35 |
| 379 | [ssh-rsa.c] |
| 380 | more timing paranoia - compare all parts of the expected decrypted |
| 381 | data before returning. AFAIK not exploitable in the SSH protocol. |
| 382 | "groovy" deraadt@ |
Damien Miller | c4bb91c | 2010-08-03 16:04:22 +1000 | [diff] [blame] | 383 | - djm@cvs.openbsd.org 2010/07/19 03:16:33 |
| 384 | [sftp-client.c] |
| 385 | bz#1797: fix swapped args in upload_dir_internal(), breaking recursive |
| 386 | upload depth checks and causing verbose printing of transfers to always |
| 387 | be turned on; patch from imorgan AT nas.nasa.gov |
Damien Miller | e11e1ea | 2010-08-03 16:04:46 +1000 | [diff] [blame] | 388 | - djm@cvs.openbsd.org 2010/07/19 09:15:12 |
| 389 | [clientloop.c readconf.c readconf.h ssh.c ssh_config.5] |
| 390 | add a "ControlPersist" option that automatically starts a background |
| 391 | ssh(1) multiplex master when connecting. This connection can stay alive |
| 392 | indefinitely, or can be set to automatically close after a user-specified |
| 393 | duration of inactivity. bz#1330 - patch by dwmw2 AT infradead.org, but |
| 394 | further hacked on by wmertens AT cisco.com, apb AT cequrux.com, |
| 395 | martin-mindrot-bugzilla AT earth.li and myself; "looks ok" markus@ |
Damien Miller | 8c1eb11 | 2010-08-03 16:05:05 +1000 | [diff] [blame] | 396 | - djm@cvs.openbsd.org 2010/07/21 02:10:58 |
| 397 | [misc.c] |
| 398 | sync timingsafe_bcmp() with the one dempsky@ committed to sys/lib/libkern |
Damien Miller | 081f3c7 | 2010-08-03 16:05:25 +1000 | [diff] [blame] | 399 | - dtucker@cvs.openbsd.org 2010/07/23 08:49:25 |
| 400 | [ssh.1] |
| 401 | Ciphers is documented in ssh_config(5) these days |
Darren Tucker | 8b7a055 | 2010-08-03 15:50:16 +1000 | [diff] [blame] | 402 | |
| 403 | 20100819 |
Darren Tucker | 12b29db | 2010-07-19 21:24:13 +1000 | [diff] [blame] | 404 | - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more |
| 405 | details about its behaviour WRT existing directories. Patch from |
| 406 | asguthrie at gmail com, ok djm. |
| 407 | |
Damien Miller | 9308fc7 | 2010-07-16 13:56:01 +1000 | [diff] [blame] | 408 | 20100716 |
| 409 | - (djm) OpenBSD CVS Sync |
| 410 | - djm@cvs.openbsd.org 2010/07/02 04:32:44 |
| 411 | [misc.c] |
| 412 | unbreak strdelim() skipping past quoted strings, e.g. |
| 413 | AllowUsers "blah blah" blah |
| 414 | was broken; report and fix in bz#1757 from bitman.zhou AT centrify.com |
| 415 | ok dtucker; |
Damien Miller | 1f25ab4 | 2010-07-16 13:56:23 +1000 | [diff] [blame] | 416 | - djm@cvs.openbsd.org 2010/07/12 22:38:52 |
| 417 | [ssh.c] |
| 418 | Make ExitOnForwardFailure work with fork-after-authentication ("ssh -f") |
| 419 | for protocol 2. ok markus@ |
Damien Miller | d0244d4 | 2010-07-16 13:56:43 +1000 | [diff] [blame] | 420 | - djm@cvs.openbsd.org 2010/07/12 22:41:13 |
| 421 | [ssh.c ssh_config.5] |
| 422 | expand %h to the hostname in ssh_config Hostname options. While this |
| 423 | sounds useless, it is actually handy for working with unqualified |
| 424 | hostnames: |
| 425 | |
| 426 | Host *.* |
| 427 | Hostname %h |
| 428 | Host * |
| 429 | Hostname %h.example.org |
| 430 | |
| 431 | "I like it" markus@ |
Damien Miller | 8a0268f | 2010-07-16 13:57:51 +1000 | [diff] [blame] | 432 | - djm@cvs.openbsd.org 2010/07/13 11:52:06 |
| 433 | [auth-rsa.c channels.c jpake.c key.c misc.c misc.h monitor.c] |
| 434 | [packet.c ssh-rsa.c] |
| 435 | implement a timing_safe_cmp() function to compare memory without leaking |
| 436 | timing information by short-circuiting like memcmp() and use it for |
| 437 | some of the more sensitive comparisons (though nothing high-value was |
| 438 | readily attackable anyway); "looks ok" markus@ |
Damien Miller | ea1651c | 2010-07-16 13:58:37 +1000 | [diff] [blame] | 439 | - djm@cvs.openbsd.org 2010/07/13 23:13:16 |
| 440 | [auth-rsa.c channels.c jpake.c key.c misc.c misc.h monitor.c packet.c] |
| 441 | [ssh-rsa.c] |
| 442 | s/timing_safe_cmp/timingsafe_bcmp/g |
Damien Miller | bcfbc48 | 2010-07-16 13:59:11 +1000 | [diff] [blame] | 443 | - jmc@cvs.openbsd.org 2010/07/14 17:06:58 |
| 444 | [ssh.1] |
| 445 | finally ssh synopsis looks nice again! this commit just removes a ton of |
| 446 | hacks we had in place to make it work with old groff; |
Damien Miller | bad5e03 | 2010-07-16 13:59:59 +1000 | [diff] [blame] | 447 | - schwarze@cvs.openbsd.org 2010/07/15 21:20:38 |
| 448 | [ssh-keygen.1] |
| 449 | repair incorrect block nesting, which screwed up indentation; |
| 450 | problem reported and fix OK by jmc@ |
Damien Miller | 9308fc7 | 2010-07-16 13:56:01 +1000 | [diff] [blame] | 451 | |
Tim Rice | cfbdc28 | 2010-07-14 13:42:28 -0700 | [diff] [blame] | 452 | 20100714 |
| 453 | - (tim) [contrib/redhat/openssh.spec] Bug 1796: Test for skip_x11_askpass |
| 454 | (line 77) should have been for no_x11_askpass. |
| 455 | |
Damien Miller | cede1db | 2010-07-02 13:33:48 +1000 | [diff] [blame] | 456 | 20100702 |
| 457 | - (djm) OpenBSD CVS Sync |
| 458 | - jmc@cvs.openbsd.org 2010/06/26 00:57:07 |
| 459 | [ssh_config.5] |
| 460 | tweak previous; |
Damien Miller | b96c441 | 2010-07-02 13:34:24 +1000 | [diff] [blame] | 461 | - djm@cvs.openbsd.org 2010/06/26 23:04:04 |
| 462 | [ssh.c] |
| 463 | oops, forgot to #include <canohost.h>; spotted and patch from chl@ |
Damien Miller | 44b2504 | 2010-07-02 13:35:01 +1000 | [diff] [blame] | 464 | - djm@cvs.openbsd.org 2010/06/29 23:15:30 |
| 465 | [ssh-keygen.1 ssh-keygen.c] |
| 466 | allow import (-i) and export (-e) of PEM and PKCS#8 encoded keys; |
| 467 | bz#1749; ok markus@ |
Damien Miller | 6018a36 | 2010-07-02 13:35:19 +1000 | [diff] [blame] | 468 | - djm@cvs.openbsd.org 2010/06/29 23:16:46 |
| 469 | [auth2-pubkey.c sshd_config.5] |
| 470 | allow key options (command="..." and friends) in AuthorizedPrincipals; |
| 471 | ok markus@ |
Damien Miller | ea72728 | 2010-07-02 13:35:34 +1000 | [diff] [blame] | 472 | - jmc@cvs.openbsd.org 2010/06/30 07:24:25 |
| 473 | [ssh-keygen.1] |
| 474 | tweak previous; |
Damien Miller | 6022f58 | 2010-07-02 13:37:01 +1000 | [diff] [blame] | 475 | - jmc@cvs.openbsd.org 2010/06/30 07:26:03 |
| 476 | [ssh-keygen.c] |
| 477 | sort usage(); |
Damien Miller | d59dab8 | 2010-07-02 13:37:17 +1000 | [diff] [blame] | 478 | - jmc@cvs.openbsd.org 2010/06/30 07:28:34 |
| 479 | [sshd_config.5] |
| 480 | tweak previous; |
Damien Miller | 0979b40 | 2010-07-02 13:37:33 +1000 | [diff] [blame] | 481 | - millert@cvs.openbsd.org 2010/07/01 13:06:59 |
| 482 | [scp.c] |
| 483 | Fix a longstanding problem where if you suspend scp at the |
| 484 | password/passphrase prompt the terminal mode is not restored. |
| 485 | OK djm@ |
Damien Miller | 527ded7 | 2010-07-02 13:40:16 +1000 | [diff] [blame] | 486 | - phessler@cvs.openbsd.org 2010/06/27 19:19:56 |
| 487 | [regress/Makefile] |
| 488 | fix how we run the tests so we can successfully use SUDO='sudo -E' |
| 489 | in our env |
Damien Miller | ab139cd | 2010-07-02 13:42:18 +1000 | [diff] [blame] | 490 | - djm@cvs.openbsd.org 2010/06/29 23:59:54 |
| 491 | [cert-userkey.sh] |
| 492 | regress tests for key options in AuthorizedPrincipals |
Damien Miller | cede1db | 2010-07-02 13:33:48 +1000 | [diff] [blame] | 493 | |
Tim Rice | 3fd307d | 2010-06-26 16:45:15 -0700 | [diff] [blame] | 494 | 20100627 |
| 495 | - (tim) [openbsd-compat/port-uw.c] Reorder includes. auth-options.h now needs |
| 496 | key.h. |
| 497 | |
Damien Miller | 2e77446 | 2010-06-26 09:30:47 +1000 | [diff] [blame] | 498 | 20100626 |
| 499 | - (djm) OpenBSD CVS Sync |
| 500 | - djm@cvs.openbsd.org 2010/05/21 05:00:36 |
| 501 | [misc.c] |
| 502 | colon() returns char*, so s/return (0)/return NULL/ |
Damien Miller | 4fe686d | 2010-06-26 09:36:10 +1000 | [diff] [blame] | 503 | - markus@cvs.openbsd.org 2010/06/08 21:32:19 |
| 504 | [ssh-pkcs11.c] |
| 505 | check length of value returned C_GetAttributValue for != 0 |
| 506 | from mdrtbugzilla@codefive.co.uk; bugzilla #1773; ok dtucker@ |
Damien Miller | c094d1e | 2010-06-26 09:36:34 +1000 | [diff] [blame] | 507 | - djm@cvs.openbsd.org 2010/06/17 07:07:30 |
| 508 | [mux.c] |
| 509 | Correct sizing of object to be allocated by calloc(), replacing |
| 510 | sizeof(state) with sizeof(*state). This worked by accident since |
| 511 | the struct contained a single int at present, but could have broken |
| 512 | in the future. patch from hyc AT symas.com |
Damien Miller | 99ac4e9 | 2010-06-26 09:36:58 +1000 | [diff] [blame] | 513 | - djm@cvs.openbsd.org 2010/06/18 00:58:39 |
| 514 | [sftp.c] |
| 515 | unbreak ls in working directories that contains globbing characters in |
| 516 | their pathnames. bz#1655 reported by vgiffin AT apple.com |
Damien Miller | 7aa46ec | 2010-06-26 09:37:57 +1000 | [diff] [blame] | 517 | - djm@cvs.openbsd.org 2010/06/18 03:16:03 |
| 518 | [session.c] |
| 519 | Missing check for chroot_director == "none" (we already checked against |
| 520 | NULL); bz#1564 from Jan.Pechanec AT Sun.COM |
Damien Miller | 4956631 | 2010-06-26 09:38:23 +1000 | [diff] [blame] | 521 | - djm@cvs.openbsd.org 2010/06/18 04:43:08 |
| 522 | [sftp-client.c] |
| 523 | fix memory leak in do_realpath() error path; bz#1771, patch from |
| 524 | anicka AT suse.cz |
Damien Miller | ab6de35 | 2010-06-26 09:38:45 +1000 | [diff] [blame] | 525 | - djm@cvs.openbsd.org 2010/06/22 04:22:59 |
| 526 | [servconf.c sshd_config.5] |
| 527 | expose some more sshd_config options inside Match blocks: |
| 528 | AuthorizedKeysFile AuthorizedPrincipalsFile |
| 529 | HostbasedUsesNameFromPacketOnly PermitTunnel |
| 530 | bz#1764; feedback from imorgan AT nas.nasa.gov; ok dtucker@ |
Damien Miller | ba3420a | 2010-06-26 09:39:07 +1000 | [diff] [blame] | 531 | - djm@cvs.openbsd.org 2010/06/22 04:32:06 |
| 532 | [ssh-keygen.c] |
| 533 | standardise error messages when attempting to open private key |
| 534 | files to include "progname: filename: error reason" |
| 535 | bz#1783; ok dtucker@ |
Damien Miller | 48147d6 | 2010-06-26 09:39:25 +1000 | [diff] [blame] | 536 | - djm@cvs.openbsd.org 2010/06/22 04:49:47 |
| 537 | [auth.c] |
| 538 | queue auth debug messages for bad ownership or permissions on the user's |
| 539 | keyfiles. These messages will be sent after the user has successfully |
| 540 | authenticated (where our client will display them with LogLevel=debug). |
Damien Miller | 0e76c5e | 2010-06-26 09:39:59 +1000 | [diff] [blame] | 541 | bz#1554; ok dtucker@ |
| 542 | - djm@cvs.openbsd.org 2010/06/22 04:54:30 |
| 543 | [ssh-keyscan.c] |
| 544 | replace verbose and overflow-prone Linebuf code with read_keyfile_line() |
| 545 | based on patch from joachim AT joachimschipper.nl; bz#1565; ok dtucker@ |
Damien Miller | 1b2b61e | 2010-06-26 09:47:43 +1000 | [diff] [blame] | 546 | - djm@cvs.openbsd.org 2010/06/22 04:59:12 |
| 547 | [session.c] |
| 548 | include the user name on "subsystem request for ..." log messages; |
| 549 | bz#1571; ok dtucker@ |
Damien Miller | d834d35 | 2010-06-26 09:48:02 +1000 | [diff] [blame] | 550 | - djm@cvs.openbsd.org 2010/06/23 02:59:02 |
| 551 | [ssh-keygen.c] |
| 552 | fix printing of extensions in v01 certificates that I broke in r1.190 |
Damien Miller | 232cfb1 | 2010-06-26 09:50:30 +1000 | [diff] [blame] | 553 | - djm@cvs.openbsd.org 2010/06/25 07:14:46 |
| 554 | [channels.c mux.c readconf.c readconf.h ssh.h] |
| 555 | bz#1327: remove hardcoded limit of 100 permitopen clauses and port |
| 556 | forwards per direction; ok markus@ stevesk@ |
Damien Miller | 8853ca5 | 2010-06-26 10:00:14 +1000 | [diff] [blame] | 557 | - djm@cvs.openbsd.org 2010/06/25 07:20:04 |
| 558 | [channels.c session.c] |
| 559 | bz#1750: fix requirement for /dev/null inside ChrootDirectory for |
| 560 | internal-sftp accidentally introduced in r1.253 by removing the code |
| 561 | that opens and dup /dev/null to stderr and modifying the channels code |
| 562 | to read stderr but discard it instead; ok markus@ |
Damien Miller | bda3eca | 2010-06-26 10:01:33 +1000 | [diff] [blame] | 563 | - djm@cvs.openbsd.org 2010/06/25 08:46:17 |
| 564 | [auth1.c auth2-none.c] |
| 565 | skip the initial check for access with an empty password when |
| 566 | PermitEmptyPasswords=no; bz#1638; ok markus@ |
Damien Miller | 383ffe6 | 2010-06-26 10:02:03 +1000 | [diff] [blame] | 567 | - djm@cvs.openbsd.org 2010/06/25 23:10:30 |
| 568 | [ssh.c] |
| 569 | log the hostname and address that we connected to at LogLevel=verbose |
| 570 | after authentication is successful to mitigate "phishing" attacks by |
| 571 | servers with trusted keys that accept authentication silently and |
| 572 | automatically before presenting fake password/passphrase prompts; |
| 573 | "nice!" markus@ |
Damien Miller | 1ab6a51 | 2010-06-26 10:02:24 +1000 | [diff] [blame] | 574 | - djm@cvs.openbsd.org 2010/06/25 23:10:30 |
| 575 | [ssh.c] |
| 576 | log the hostname and address that we connected to at LogLevel=verbose |
| 577 | after authentication is successful to mitigate "phishing" attacks by |
| 578 | servers with trusted keys that accept authentication silently and |
| 579 | automatically before presenting fake password/passphrase prompts; |
| 580 | "nice!" markus@ |
Damien Miller | 2e77446 | 2010-06-26 09:30:47 +1000 | [diff] [blame] | 581 | |
Damien Miller | d82a260 | 2010-06-22 15:02:39 +1000 | [diff] [blame] | 582 | 20100622 |
| 583 | - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 |
| 584 | bz#1579; ok dtucker |
| 585 | |
Damien Miller | ea90979 | 2010-06-18 11:09:24 +1000 | [diff] [blame] | 586 | 20100618 |
| 587 | - (djm) [contrib/ssh-copy-id] Update key file explicitly under ~ |
| 588 | rather than assuming that $CWD == $HOME. bz#1500, patch from |
| 589 | timothy AT gelter.com |
| 590 | |
Tim Rice | b9ae4ec | 2010-06-17 11:11:44 -0700 | [diff] [blame] | 591 | 20100617 |
| 592 | - (tim) [contrib/cygwin/README] Remove a reference to the obsolete |
| 593 | minires-devel package, and to add the reference to the libedit-devel |
| 594 | package since CYgwin now provides libedit. Patch from Corinna Vinschen. |
| 595 | |
Damien Miller | 3bcce80 | 2010-05-21 14:48:16 +1000 | [diff] [blame] | 596 | 20100521 |
| 597 | - (djm) OpenBSD CVS Sync |
| 598 | - djm@cvs.openbsd.org 2010/05/07 11:31:26 |
| 599 | [regress/Makefile regress/cert-userkey.sh] |
| 600 | regress tests for AuthorizedPrincipalsFile and "principals=" key option. |
| 601 | feedback and ok markus@ |
Damien Miller | 3b90382 | 2010-05-21 14:56:25 +1000 | [diff] [blame] | 602 | - djm@cvs.openbsd.org 2010/05/11 02:58:04 |
| 603 | [auth-rsa.c] |
| 604 | don't accept certificates marked as "cert-authority" here; ok markus@ |
Damien Miller | c6afb5f | 2010-05-21 14:56:47 +1000 | [diff] [blame] | 605 | - djm@cvs.openbsd.org 2010/05/14 00:47:22 |
| 606 | [ssh-add.c] |
| 607 | check that the certificate matches the corresponding private key before |
| 608 | grafting it on |
Damien Miller | d530f5f | 2010-05-21 14:57:10 +1000 | [diff] [blame] | 609 | - djm@cvs.openbsd.org 2010/05/14 23:29:23 |
| 610 | [channels.c channels.h mux.c ssh.c] |
| 611 | Pause the mux channel while waiting for reply from aynch callbacks. |
| 612 | Prevents misordering of replies if new requests arrive while waiting. |
| 613 | |
| 614 | Extend channel open confirm callback to allow signalling failure |
| 615 | conditions as well as success. Use this to 1) fix a memory leak, 2) |
| 616 | start using the above pause mechanism and 3) delay sending a success/ |
| 617 | failure message on mux slave session open until we receive a reply from |
| 618 | the server. |
| 619 | |
| 620 | motivated by and with feedback from markus@ |
Damien Miller | 388f6fc | 2010-05-21 14:57:35 +1000 | [diff] [blame] | 621 | - markus@cvs.openbsd.org 2010/05/16 12:55:51 |
| 622 | [PROTOCOL.mux clientloop.h mux.c readconf.c readconf.h ssh.1 ssh.c] |
| 623 | mux support for remote forwarding with dynamic port allocation, |
| 624 | use with |
| 625 | LPORT=`ssh -S muxsocket -R0:localhost:25 -O forward somehost` |
| 626 | feedback and ok djm@ |
Damien Miller | 8439955 | 2010-05-21 14:58:12 +1000 | [diff] [blame] | 627 | - djm@cvs.openbsd.org 2010/05/20 11:25:26 |
| 628 | [auth2-pubkey.c] |
| 629 | fix logspam when key options (from="..." especially) deny non-matching |
| 630 | keys; reported by henning@ also bz#1765; ok markus@ dtucker@ |
Damien Miller | d0e4a8e | 2010-05-21 14:58:32 +1000 | [diff] [blame] | 631 | - djm@cvs.openbsd.org 2010/05/20 23:46:02 |
| 632 | [PROTOCOL.certkeys auth-options.c ssh-keygen.c] |
| 633 | Move the permit-* options to the non-critical "extensions" field for v01 |
| 634 | certificates. The logic is that if another implementation fails to |
| 635 | implement them then the connection just loses features rather than fails |
| 636 | outright. |
| 637 | |
| 638 | ok markus@ |
Damien Miller | 3bcce80 | 2010-05-21 14:48:16 +1000 | [diff] [blame] | 639 | |
Darren Tucker | 5b6d0d0 | 2010-05-12 16:51:38 +1000 | [diff] [blame] | 640 | 20100511 |
| 641 | - (dtucker) [Makefile.in] Bug #1770: Link libopenbsd-compat twice to solve |
| 642 | circular dependency problem on old or odd platforms. From Tom Lane, ok |
| 643 | djm@. |
Damien Miller | 4b1ec83 | 2010-05-12 17:49:59 +1000 | [diff] [blame] | 644 | - (djm) [openbsd-compat/openssl-compat.h] Fix build breakage on older |
| 645 | libcrypto by defining OPENSSL_[DR]SA_MAX_MODULUS_BITS if they aren't |
| 646 | already. ok dtucker@ |
Darren Tucker | 5b6d0d0 | 2010-05-12 16:51:38 +1000 | [diff] [blame] | 647 | |
Damien Miller | 50af79b | 2010-05-10 11:52:00 +1000 | [diff] [blame] | 648 | 20100510 |
| 649 | - OpenBSD CVS Sync |
| 650 | - djm@cvs.openbsd.org 2010/04/23 01:47:41 |
| 651 | [ssh-keygen.c] |
| 652 | bz#1740: display a more helpful error message when $HOME is |
| 653 | inaccessible while trying to create .ssh directory. Based on patch |
| 654 | from jchadima AT redhat.com; ok dtucker@ |
Damien Miller | 85c50d7 | 2010-05-10 11:53:02 +1000 | [diff] [blame] | 655 | - djm@cvs.openbsd.org 2010/04/23 22:27:38 |
| 656 | [mux.c] |
| 657 | set "detach_close" flag when registering channel cleanup callbacks. |
| 658 | This causes the channel to close normally when its fds close and |
| 659 | hangs when terminating a mux slave using ~. bz#1758; ok markus@ |
Damien Miller | 22a2988 | 2010-05-10 11:53:54 +1000 | [diff] [blame] | 660 | - djm@cvs.openbsd.org 2010/04/23 22:42:05 |
| 661 | [session.c] |
| 662 | set stderr to /dev/null for subsystems rather than just closing it. |
| 663 | avoids hangs if a subsystem or shell initialisation writes to stderr. |
| 664 | bz#1750; ok markus@ |
Damien Miller | bebbb7e | 2010-05-10 11:54:38 +1000 | [diff] [blame] | 665 | - djm@cvs.openbsd.org 2010/04/23 22:48:31 |
| 666 | [ssh-keygen.c] |
| 667 | refuse to generate keys longer than OPENSSL_[RD]SA_MAX_MODULUS_BITS, |
| 668 | since we would refuse to use them anyway. bz#1516; ok dtucker@ |
Damien Miller | 79442c0 | 2010-05-10 11:55:38 +1000 | [diff] [blame] | 669 | - djm@cvs.openbsd.org 2010/04/26 22:28:24 |
| 670 | [sshconnect2.c] |
| 671 | bz#1502: authctxt.success is declared as an int, but passed by |
| 672 | reference to function that accepts sig_atomic_t*. Convert it to |
| 673 | the latter; ok markus@ dtucker@ |
Damien Miller | 2725c21 | 2010-05-10 11:56:14 +1000 | [diff] [blame] | 674 | - djm@cvs.openbsd.org 2010/05/01 02:50:50 |
| 675 | [PROTOCOL.certkeys] |
| 676 | typo; jmeltzer@ |
Damien Miller | 099fc16 | 2010-05-10 11:56:50 +1000 | [diff] [blame] | 677 | - dtucker@cvs.openbsd.org 2010/05/05 04:22:09 |
| 678 | [sftp.c] |
| 679 | restore mput and mget which got lost in the tab-completion changes. |
| 680 | found by Kenneth Whitaker, ok djm@ |
Damien Miller | 30da344 | 2010-05-10 11:58:03 +1000 | [diff] [blame] | 681 | - djm@cvs.openbsd.org 2010/05/07 11:30:30 |
| 682 | [auth-options.c auth-options.h auth.c auth.h auth2-pubkey.c] |
| 683 | [key.c servconf.c servconf.h sshd.8 sshd_config.5] |
| 684 | add some optional indirection to matching of principal names listed |
| 685 | in certificates. Currently, a certificate must include the a user's name |
| 686 | to be accepted for authentication. This change adds the ability to |
| 687 | specify a list of certificate principal names that are acceptable. |
| 688 | |
| 689 | When authenticating using a CA trusted through ~/.ssh/authorized_keys, |
| 690 | this adds a new principals="name1[,name2,...]" key option. |
| 691 | |
| 692 | For CAs listed through sshd_config's TrustedCAKeys option, a new config |
| 693 | option "AuthorizedPrincipalsFile" specifies a per-user file containing |
| 694 | the list of acceptable names. |
| 695 | |
| 696 | If either option is absent, the current behaviour of requiring the |
| 697 | username to appear in principals continues to apply. |
| 698 | |
| 699 | These options are useful for role accounts, disjoint account namespaces |
| 700 | and "user@realm"-style naming policies in certificates. |
| 701 | |
| 702 | feedback and ok markus@ |
Damien Miller | 81d3fc5 | 2010-05-10 11:58:45 +1000 | [diff] [blame] | 703 | - jmc@cvs.openbsd.org 2010/05/07 12:49:17 |
| 704 | [sshd_config.5] |
| 705 | tweak previous; |
Damien Miller | 50af79b | 2010-05-10 11:52:00 +1000 | [diff] [blame] | 706 | |
Darren Tucker | 9f8703b | 2010-04-23 11:12:06 +1000 | [diff] [blame] | 707 | 20100423 |
| 708 | - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir |
| 709 | in the openssl install directory (some newer openssl versions do this on at |
| 710 | least some amd64 platforms). |
| 711 | |
Damien Miller | c4eddee | 2010-04-18 08:07:43 +1000 | [diff] [blame] | 712 | 20100418 |
| 713 | - OpenBSD CVS Sync |
| 714 | - jmc@cvs.openbsd.org 2010/04/16 06:45:01 |
| 715 | [ssh_config.5] |
| 716 | tweak previous; ok djm |
Damien Miller | 1f18142 | 2010-04-18 08:08:03 +1000 | [diff] [blame] | 717 | - jmc@cvs.openbsd.org 2010/04/16 06:47:04 |
| 718 | [ssh-keygen.1 ssh-keygen.c] |
| 719 | tweak previous; ok djm |
Damien Miller | c617aa9 | 2010-04-18 08:08:20 +1000 | [diff] [blame] | 720 | - djm@cvs.openbsd.org 2010/04/16 21:14:27 |
| 721 | [sshconnect.c] |
| 722 | oops, %r => remote username, not %u |
Damien Miller | 53f4bb6 | 2010-04-18 08:15:14 +1000 | [diff] [blame] | 723 | - djm@cvs.openbsd.org 2010/04/16 01:58:45 |
| 724 | [regress/cert-hostkey.sh regress/cert-userkey.sh] |
| 725 | regression tests for v01 certificate format |
| 726 | includes interop tests for v00 certs |
Darren Tucker | e25a9bd | 2010-04-18 13:35:00 +1000 | [diff] [blame] | 727 | - (dtucker) [contrib/aix/buildbff.sh] Fix creation of ssh_prng_cmds.default |
| 728 | file. |
Damien Miller | c4eddee | 2010-04-18 08:07:43 +1000 | [diff] [blame] | 729 | |
Damien Miller | a45f1c0 | 2010-04-16 15:51:34 +1000 | [diff] [blame] | 730 | 20100416 |
| 731 | - (djm) Release openssh-5.5p1 |
Damien Miller | d6fc306 | 2010-04-16 15:51:45 +1000 | [diff] [blame] | 732 | - OpenBSD CVS Sync |
| 733 | - djm@cvs.openbsd.org 2010/03/26 03:13:17 |
| 734 | [bufaux.c] |
| 735 | allow buffer_get_int_ret/buffer_get_int64_ret to take a NULL pointer |
| 736 | argument to allow skipping past values in a buffer |
Damien Miller | 67f30d7 | 2010-04-16 15:52:03 +1000 | [diff] [blame] | 737 | - jmc@cvs.openbsd.org 2010/03/26 06:54:36 |
| 738 | [ssh.1] |
| 739 | tweak previous; |
Damien Miller | 544378d | 2010-04-16 15:52:24 +1000 | [diff] [blame] | 740 | - jmc@cvs.openbsd.org 2010/03/27 14:26:55 |
| 741 | [ssh_config.5] |
| 742 | tweak previous; ok dtucker |
Damien Miller | deb5a14 | 2010-04-16 15:52:43 +1000 | [diff] [blame] | 743 | - djm@cvs.openbsd.org 2010/04/10 00:00:16 |
| 744 | [ssh.c] |
| 745 | bz#1746 - suppress spurious tty warning when using -O and stdin |
| 746 | is not a tty; ok dtucker@ markus@ |
Damien Miller | 6728399 | 2010-04-16 15:53:02 +1000 | [diff] [blame] | 747 | - djm@cvs.openbsd.org 2010/04/10 00:04:30 |
| 748 | [sshconnect.c] |
| 749 | fix terminology: we didn't find a certificate in known_hosts, we found |
| 750 | a CA key |
Damien Miller | 22c97f1 | 2010-04-16 15:53:23 +1000 | [diff] [blame] | 751 | - djm@cvs.openbsd.org 2010/04/10 02:08:44 |
| 752 | [clientloop.c] |
| 753 | bz#1698: kill channel when pty allocation requests fail. Fixed |
| 754 | stuck client if the server refuses pty allocation. |
| 755 | ok dtucker@ "think so" markus@ |
Damien Miller | 8868065 | 2010-04-16 15:53:43 +1000 | [diff] [blame] | 756 | - djm@cvs.openbsd.org 2010/04/10 02:10:56 |
| 757 | [sshconnect2.c] |
| 758 | show the key type that we are offering in debug(), helps distinguish |
| 759 | between certs and plain keys as the path to the private key is usually |
| 760 | the same. |
Damien Miller | 601a23c | 2010-04-16 15:54:01 +1000 | [diff] [blame] | 761 | - djm@cvs.openbsd.org 2010/04/10 05:48:16 |
| 762 | [mux.c] |
| 763 | fix NULL dereference; from matthew.haub AT alumni.adelaide.edu.au |
Damien Miller | b1b1704 | 2010-04-16 15:54:19 +1000 | [diff] [blame] | 764 | - djm@cvs.openbsd.org 2010/04/14 22:27:42 |
| 765 | [ssh_config.5 sshconnect.c] |
| 766 | expand %r => remote username in ssh_config:ProxyCommand; |
| 767 | ok deraadt markus |
Damien Miller | 031c910 | 2010-04-16 15:54:44 +1000 | [diff] [blame] | 768 | - markus@cvs.openbsd.org 2010/04/15 20:32:55 |
| 769 | [ssh-pkcs11.c] |
| 770 | retry lookup for private key if there's no matching key with CKA_SIGN |
| 771 | attribute enabled; this fixes fixes MuscleCard support (bugzilla #1736) |
| 772 | ok djm@ |
Damien Miller | 4e270b0 | 2010-04-16 15:56:21 +1000 | [diff] [blame] | 773 | - djm@cvs.openbsd.org 2010/04/16 01:47:26 |
| 774 | [PROTOCOL.certkeys auth-options.c auth-options.h auth-rsa.c] |
| 775 | [auth2-pubkey.c authfd.c key.c key.h myproposal.h ssh-add.c] |
| 776 | [ssh-agent.c ssh-dss.c ssh-keygen.1 ssh-keygen.c ssh-rsa.c] |
| 777 | [sshconnect.c sshconnect2.c sshd.c] |
| 778 | revised certificate format ssh-{dss,rsa}-cert-v01@openssh.com with the |
| 779 | following changes: |
| 780 | |
| 781 | move the nonce field to the beginning of the certificate where it can |
| 782 | better protect against chosen-prefix attacks on the signature hash |
| 783 | |
| 784 | Rename "constraints" field to "critical options" |
| 785 | |
| 786 | Add a new non-critical "extensions" field |
| 787 | |
| 788 | Add a serial number |
| 789 | |
| 790 | The older format is still support for authentication and cert generation |
| 791 | (use "ssh-keygen -t v00 -s ca_key ..." to generate a v00 certificate) |
| 792 | |
| 793 | ok markus@ |
Damien Miller | a45f1c0 | 2010-04-16 15:51:34 +1000 | [diff] [blame] | 794 | |
Darren Tucker | 627337d | 2010-04-10 22:58:01 +1000 | [diff] [blame] | 795 | 20100410 |
| 796 | - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo |
| 797 | back so we disable the IPv6 tests if we don't have it. |
| 798 | |
Darren Tucker | 537d4dc | 2010-04-09 13:35:23 +1000 | [diff] [blame] | 799 | 20100409 |
| 800 | - (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong |
| 801 | ones. Based on a patch from Roumen Petrov. |
Darren Tucker | c4ccb12 | 2010-04-09 14:04:35 +1000 | [diff] [blame] | 802 | - (dtucker) [configure.ac] Bug #1744: use pkg-config for libedit flags if we |
| 803 | have it and the path is not provided to --with-libedit. Based on a patch |
| 804 | from Iain Morgan. |
Darren Tucker | 261d93a | 2010-04-09 18:13:27 +1000 | [diff] [blame] | 805 | - (dtucker) [configure.ac defines.h loginrec.c logintest.c] Bug #1732: enable |
| 806 | utmpx support on FreeBSD where possible. Patch from Ed Schouten, ok djm@ |
Darren Tucker | 537d4dc | 2010-04-09 13:35:23 +1000 | [diff] [blame] | 807 | |
Damien Miller | 7d09b8f | 2010-03-26 08:52:02 +1100 | [diff] [blame] | 808 | 20100326 |
| 809 | - (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection |
| 810 | for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson |
Darren Tucker | a83d90f | 2010-03-26 10:27:33 +1100 | [diff] [blame] | 811 | - (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally |
| 812 | by Ingo Weinhold via Scott McCreary, ok djm@ |
Damien Miller | 44451d0 | 2010-03-26 10:40:04 +1100 | [diff] [blame] | 813 | - (djm) OpenBSD CVS Sync |
| 814 | - djm@cvs.openbsd.org 2010/03/25 23:38:28 |
| 815 | [servconf.c] |
| 816 | from portable: getcwd(NULL, 0) doesn't work on all platforms, so |
| 817 | use a stack buffer; ok dtucker@ |
Damien Miller | 9c60f24 | 2010-03-26 11:28:35 +1100 | [diff] [blame] | 818 | - djm@cvs.openbsd.org 2010/03/26 00:26:58 |
| 819 | [ssh.1] |
| 820 | mention that -S none disables connection sharing; from Colin Watson |
Damien Miller | 8b90642 | 2010-03-26 11:04:09 +1100 | [diff] [blame] | 821 | - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms - |
| 822 | set up SELinux execution context before chroot() call. From Russell |
| 823 | Coker via Colin watson; bz#1726 ok dtucker@ |
Damien Miller | 6480c63 | 2010-03-26 11:09:44 +1100 | [diff] [blame] | 824 | - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721 |
| 825 | ok dtucker@ |
Darren Tucker | ffd1eaa | 2010-03-26 11:16:39 +1100 | [diff] [blame] | 826 | - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using |
| 827 | pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold). |
Damien Miller | df08341 | 2010-03-26 11:18:27 +1100 | [diff] [blame] | 828 | - (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys; |
| 829 | bz#1723 patch from Adeodato Simóvia Colin Watson; ok dtucker@ |
Darren Tucker | ce3754b | 2010-03-26 12:09:13 +1100 | [diff] [blame] | 830 | - (dtucker) OpenBSD CVS Sync |
| 831 | - dtucker@cvs.openbsd.org 2010/03/26 01:06:13 |
| 832 | [ssh_config.5] |
| 833 | Reformat default value of PreferredAuthentications entry (current |
| 834 | formatting implies ", " is acceptable as a separator, which it's not. |
| 835 | ok djm@ |
Damien Miller | 7d09b8f | 2010-03-26 08:52:02 +1100 | [diff] [blame] | 836 | |
Darren Tucker | 62131dc | 2010-03-24 13:03:32 +1100 | [diff] [blame] | 837 | 20100324 |
| 838 | - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory |
| 839 | containing the services file explicitely case-insensitive. This allows to |
| 840 | tweak the Windows services file reliably. Patch from vinschen at redhat. |
| 841 | |
Damien Miller | c59e244 | 2010-03-22 05:50:31 +1100 | [diff] [blame] | 842 | 20100321 |
| 843 | - (djm) OpenBSD CVS Sync |
| 844 | - jmc@cvs.openbsd.org 2010/03/08 09:41:27 |
| 845 | [ssh-keygen.1] |
| 846 | sort the list of constraints (to -O); ok djm |
Damien Miller | 77497e1 | 2010-03-22 05:50:51 +1100 | [diff] [blame] | 847 | - jmc@cvs.openbsd.org 2010/03/10 07:40:35 |
| 848 | [ssh-keygen.1] |
| 849 | typos; from Ross Richardson |
| 850 | closes prs 6334 and 6335 |
Damien Miller | e513a91 | 2010-03-22 05:51:21 +1100 | [diff] [blame] | 851 | - djm@cvs.openbsd.org 2010/03/10 23:27:17 |
| 852 | [auth2-pubkey.c] |
| 853 | correct certificate logging and make it more consistent between |
| 854 | authorized_keys and TrustedCAKeys; ok markus@ |
Damien Miller | c4cb47b | 2010-03-22 05:52:26 +1100 | [diff] [blame] | 855 | - djm@cvs.openbsd.org 2010/03/12 01:06:25 |
| 856 | [servconf.c] |
| 857 | unbreak AuthorizedKeys option with a $HOME-relative path; reported by |
| 858 | vinschen AT redhat.com, ok dtucker@ |
Damien Miller | 4a5f0d3 | 2010-03-22 05:53:04 +1100 | [diff] [blame] | 859 | - markus@cvs.openbsd.org 2010/03/12 11:37:40 |
| 860 | [servconf.c] |
| 861 | do not prepend AuthorizedKeysFile with getcwd(), unbreaks relative paths |
| 862 | free() (not xfree()) the buffer returned by getcwd() |
Damien Miller | 8ddc71c | 2010-03-22 05:54:02 +1100 | [diff] [blame] | 863 | - djm@cvs.openbsd.org 2010/03/13 21:10:38 |
| 864 | [clientloop.c] |
| 865 | protocol conformance fix: send language tag when disconnecting normally; |
| 866 | spotted by 1.41421 AT gmail.com, ok markus@ deraadt@ |
Damien Miller | 1b61a28 | 2010-03-22 05:55:06 +1100 | [diff] [blame] | 867 | - djm@cvs.openbsd.org 2010/03/13 21:45:46 |
| 868 | [ssh-keygen.1] |
| 869 | Certificates are named *-cert.pub, not *_cert.pub; committing a diff |
| 870 | from stevesk@ ok me |
Damien Miller | 5a5d94b | 2010-03-22 05:57:49 +1100 | [diff] [blame] | 871 | - jmc@cvs.openbsd.org 2010/03/13 23:38:13 |
| 872 | [ssh-keygen.1] |
| 873 | fix a formatting error (args need quoted); noted by stevesk |
Damien Miller | 1cfbfaf | 2010-03-22 05:58:24 +1100 | [diff] [blame] | 874 | - stevesk@cvs.openbsd.org 2010/03/15 19:40:02 |
| 875 | [key.c key.h ssh-keygen.c] |
| 876 | also print certificate type (user or host) for ssh-keygen -L |
| 877 | ok djm kettenis |
Damien Miller | 33334b2 | 2010-03-22 05:59:02 +1100 | [diff] [blame] | 878 | - stevesk@cvs.openbsd.org 2010/03/16 15:46:52 |
| 879 | [auth-options.c] |
| 880 | spelling in error message. ok djm kettenis |
Damien Miller | 13a9f72 | 2010-03-22 05:59:22 +1100 | [diff] [blame] | 881 | - djm@cvs.openbsd.org 2010/03/16 16:36:49 |
| 882 | [version.h] |
| 883 | crank version to openssh-5.5 since we have a few fixes since 5.4; |
| 884 | requested deraadt@ kettenis@ |
Damien Miller | b086d4a | 2010-03-22 06:11:55 +1100 | [diff] [blame] | 885 | - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
| 886 | [contrib/suse/openssh.spec] Crank version numbers |
Damien Miller | c59e244 | 2010-03-22 05:50:31 +1100 | [diff] [blame] | 887 | |
Damien Miller | 47f9a41 | 2010-03-14 08:37:49 +1100 | [diff] [blame] | 888 | 20100314 |
| 889 | - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix |
| 890 | compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot |
| 891 | AT fefe.de |
Damien Miller | 1f574b2 | 2010-03-14 08:41:34 +1100 | [diff] [blame] | 892 | - (djm) [Makefile.in] Respecify -lssh after -lopenbsd-compat for |
| 893 | ssh-pkcs11-helper to repair static builds (we do the same for |
| 894 | ssh-keyscan). Reported by felix-mindrot AT fefe.de |
Damien Miller | 47f9a41 | 2010-03-14 08:37:49 +1100 | [diff] [blame] | 895 | |
Tim Rice | 2bde3ee | 2010-03-11 22:18:13 -0800 | [diff] [blame] | 896 | 20100312 |
Tim Rice | ded8fa0 | 2010-03-11 22:32:02 -0800 | [diff] [blame] | 897 | - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir) |
| 898 | - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets. |
| 899 | Patch from Corinna Vinschen. |
Tim Rice | 4e0cea8 | 2010-03-11 22:35:19 -0800 | [diff] [blame] | 900 | - (tim) [contrib/cygwin/Makefile] Fix list of documentation files to install |
| 901 | on a Cygwin installation. Patch from Corinna Vinschen. |
Tim Rice | 2bde3ee | 2010-03-11 22:18:13 -0800 | [diff] [blame] | 902 | |
Tim Rice | fa233ba | 2010-03-10 16:12:02 -0800 | [diff] [blame] | 903 | 20100311 |
| 904 | - (tim) [contrib/suse/openssh.spec] crank version number here too. |
| 905 | report by imorgan AT nas.nasa.gov |
| 906 | |
Darren Tucker | c9fe39b | 2010-03-09 20:42:30 +1100 | [diff] [blame] | 907 | 20100309 |
| 908 | - (dtucker) [configure.ac] Use a proper AC_CHECK_DECL for BROKEN_GETADDRINFO |
| 909 | so setting it in CFLAGS correctly skips IPv6 tests. |
| 910 | |
| 911 | 20100308 |
Damien Miller | b3bc331 | 2010-03-08 09:03:33 +1100 | [diff] [blame] | 912 | - (djm) OpenBSD CVS Sync |
Damien Miller | 3e1ee49 | 2010-03-08 09:24:11 +1100 | [diff] [blame] | 913 | - djm@cvs.openbsd.org 2010/03/07 22:16:01 |
| 914 | [ssh-keygen.c] |
| 915 | make internal strptime string match strftime format; |
| 916 | suggested by vinschen AT redhat.com and markus@ |
Damien Miller | 081c976 | 2010-03-08 11:30:00 +1100 | [diff] [blame] | 917 | - djm@cvs.openbsd.org 2010/03/08 00:28:55 |
| 918 | [ssh-keygen.1] |
| 919 | document permit-agent-forwarding certificate constraint; patch from |
| 920 | stevesk@ |
Damien Miller | b3bc331 | 2010-03-08 09:03:33 +1100 | [diff] [blame] | 921 | - djm@cvs.openbsd.org 2010/03/07 22:01:32 |
| 922 | [version.h] |
| 923 | openssh-5.4 |
Damien Miller | 6bf3178 | 2010-03-08 09:41:02 +1100 | [diff] [blame] | 924 | - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
| 925 | crank version numbers |
Damien Miller | 9586787 | 2010-03-08 09:50:17 +1100 | [diff] [blame] | 926 | - (djm) Release OpenSSH-5.4p1 |
Damien Miller | b3bc331 | 2010-03-08 09:03:33 +1100 | [diff] [blame] | 927 | |
| 928 | 20100307 |
Darren Tucker | b3d20a3 | 2010-03-07 11:56:59 +1100 | [diff] [blame] | 929 | - (dtucker) [auth.c] Bug #1710: call setauthdb on AIX before getpwuid so that |
| 930 | it gets the passwd struct from the LAM that knows about the user which is |
| 931 | not necessarily the default. Patch from Alexandre Letourneau. |
Darren Tucker | c738e6c | 2010-03-07 13:21:12 +1100 | [diff] [blame] | 932 | - (dtucker) [session.c] Bug #1567: move setpcred call to before chroot and |
| 933 | do not set real uid, since that's needed for the chroot, and will be set |
| 934 | by permanently_set_uid. |
Darren Tucker | ac0c4c9 | 2010-03-07 13:32:16 +1100 | [diff] [blame] | 935 | - (dtucker) [session.c] Also initialize creds to NULL for handing to |
| 936 | setpcred. |
Darren Tucker | cd70e1b | 2010-03-07 23:05:17 +1100 | [diff] [blame] | 937 | - (dtucker) OpenBSD CVS Sync |
| 938 | - dtucker@cvs.openbsd.org 2010/03/07 11:57:13 |
| 939 | [auth-rhosts.c monitor.c monitor_wrap.c session.c auth-options.c sshd.c] |
| 940 | Hold authentication debug messages until after successful authentication. |
| 941 | Fixes an info leak of environment variables specified in authorized_keys, |
| 942 | reported by Jacob Appelbaum. ok djm@ |
Darren Tucker | b3d20a3 | 2010-03-07 11:56:59 +1100 | [diff] [blame] | 943 | |
Damien Miller | 72b3382 | 2010-03-05 07:39:01 +1100 | [diff] [blame] | 944 | 20100305 |
| 945 | - OpenBSD CVS Sync |
| 946 | - jmc@cvs.openbsd.org 2010/03/04 12:51:25 |
| 947 | [ssh.1 sshd_config.5] |
| 948 | tweak previous; |
Damien Miller | f2b70ca | 2010-03-05 07:39:35 +1100 | [diff] [blame] | 949 | - djm@cvs.openbsd.org 2010/03/04 20:35:08 |
| 950 | [ssh-keygen.1 ssh-keygen.c] |
| 951 | Add a -L flag to print the contents of a certificate; ok markus@ |
Damien Miller | 8f6c337 | 2010-03-05 10:41:26 +1100 | [diff] [blame] | 952 | - jmc@cvs.openbsd.org 2010/03/04 22:52:40 |
| 953 | [ssh-keygen.1] |
| 954 | fix Bk/Ek; |
Damien Miller | c6db99e | 2010-03-05 10:41:45 +1100 | [diff] [blame] | 955 | - djm@cvs.openbsd.org 2010/03/04 23:17:25 |
| 956 | [sshd_config.5] |
| 957 | missing word; spotted by jmc@ |
Damien Miller | a7dab8b | 2010-03-05 10:42:05 +1100 | [diff] [blame] | 958 | - djm@cvs.openbsd.org 2010/03/04 23:19:29 |
| 959 | [ssh.1 sshd.8] |
| 960 | move section on CA and revoked keys from ssh.1 to sshd.8's known hosts |
| 961 | format section and rework it a bit; requested by jmc@ |
Damien Miller | 689b872 | 2010-03-05 10:42:24 +1100 | [diff] [blame] | 962 | - djm@cvs.openbsd.org 2010/03/04 23:27:25 |
| 963 | [auth-options.c ssh-keygen.c] |
| 964 | "force-command" is not spelled "forced-command"; spotted by |
| 965 | imorgan AT nas.nasa.gov |
Damien Miller | b068d0a | 2010-03-05 14:03:03 +1100 | [diff] [blame] | 966 | - djm@cvs.openbsd.org 2010/03/05 02:58:11 |
| 967 | [auth.c] |
| 968 | make the warning for a revoked key louder and more noticable |
Damien Miller | 9833905 | 2010-03-05 21:30:35 +1100 | [diff] [blame] | 969 | - jmc@cvs.openbsd.org 2010/03/05 06:50:35 |
| 970 | [ssh.1 sshd.8] |
| 971 | tweak previous; |
Damien Miller | 922b541 | 2010-03-05 21:30:54 +1100 | [diff] [blame] | 972 | - jmc@cvs.openbsd.org 2010/03/05 08:31:20 |
| 973 | [ssh.1] |
| 974 | document certificate authentication; help/ok djm |
Damien Miller | 5059d8d | 2010-03-05 21:31:11 +1100 | [diff] [blame] | 975 | - djm@cvs.openbsd.org 2010/03/05 10:28:21 |
| 976 | [ssh-add.1 ssh.1 ssh_config.5] |
| 977 | mention loading of certificate files from [private]-cert.pub when |
| 978 | they are present; feedback and ok jmc@ |
Tim Rice | 179eee0 | 2010-03-04 12:48:05 -0800 | [diff] [blame] | 979 | - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older |
| 980 | compilers. OK djm@ |
Damien Miller | 48b6021 | 2010-03-05 11:40:19 +1100 | [diff] [blame] | 981 | - (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure |
| 982 | on some platforms |
Damien Miller | 9527f22 | 2010-03-05 15:04:35 +1100 | [diff] [blame] | 983 | - (djm) [configure.ac] set -fno-strict-aliasing for gcc4; ok dtucker@ |
Damien Miller | 72b3382 | 2010-03-05 07:39:01 +1100 | [diff] [blame] | 984 | |
Damien Miller | 910f209 | 2010-03-04 14:17:22 +1100 | [diff] [blame] | 985 | 20100304 |
| 986 | - (djm) [ssh-keygen.c] Use correct local variable, instead of |
| 987 | maybe-undefined global "optarg" |
Damien Miller | 661ffc1 | 2010-03-04 21:09:24 +1100 | [diff] [blame] | 988 | - (djm) [contrib/redhat/openssh.spec] Replace obsolete BuildPreReq |
| 989 | on XFree86-devel with neutral /usr/include/X11/Xlib.h; |
| 990 | imorgan AT nas.nasa.gov in bz#1731 |
Damien Miller | d45f3b6 | 2010-03-04 21:09:46 +1100 | [diff] [blame] | 991 | - (djm) [.cvsignore] Ignore ssh-pkcs11-helper |
Damien Miller | e1abf4d | 2010-03-04 21:41:29 +1100 | [diff] [blame] | 992 | - (djm) [regress/Makefile] Cleanup sshd_proxy_orig |
Damien Miller | 4139657 | 2010-03-04 21:51:11 +1100 | [diff] [blame] | 993 | - OpenBSD CVS Sync |
| 994 | - djm@cvs.openbsd.org 2010/03/03 01:44:36 |
| 995 | [auth-options.c key.c] |
| 996 | reject strings with embedded ASCII nul chars in certificate key IDs, |
| 997 | principal names and constraints |
Damien Miller | cd38c9c | 2010-03-04 21:51:37 +1100 | [diff] [blame] | 998 | - djm@cvs.openbsd.org 2010/03/03 22:49:50 |
| 999 | [sshd.8] |
| 1000 | the authorized_keys option for CA keys is "cert-authority", not |
| 1001 | "from=cert-authority". spotted by imorgan AT nas.nasa.gov |
Damien Miller | fe588e3 | 2010-03-04 21:52:00 +1100 | [diff] [blame] | 1002 | - djm@cvs.openbsd.org 2010/03/03 22:50:40 |
| 1003 | [PROTOCOL.certkeys] |
| 1004 | s/similar same/similar/; from imorgan AT nas.nasa.gov |
Damien Miller | 2befbad | 2010-03-04 21:52:18 +1100 | [diff] [blame] | 1005 | - djm@cvs.openbsd.org 2010/03/04 01:44:57 |
| 1006 | [key.c] |
| 1007 | use buffer_get_string_ptr_ret() where we are checking the return |
| 1008 | value explicitly instead of the fatal()-causing buffer_get_string_ptr() |
Damien Miller | 1aed65e | 2010-03-04 21:53:35 +1100 | [diff] [blame] | 1009 | - djm@cvs.openbsd.org 2010/03/04 10:36:03 |
| 1010 | [auth-rh-rsa.c auth-rsa.c auth.c auth.h auth2-hostbased.c auth2-pubkey.c] |
| 1011 | [authfile.c authfile.h hostfile.c hostfile.h servconf.c servconf.h] |
| 1012 | [ssh-keygen.c ssh.1 sshconnect.c sshd_config.5] |
| 1013 | Add a TrustedUserCAKeys option to sshd_config to specify CA keys that |
| 1014 | are trusted to authenticate users (in addition than doing it per-user |
| 1015 | in authorized_keys). |
| 1016 | |
| 1017 | Add a RevokedKeys option to sshd_config and a @revoked marker to |
| 1018 | known_hosts to allow keys to me revoked and banned for user or host |
| 1019 | authentication. |
| 1020 | |
| 1021 | feedback and ok markus@ |
Damien Miller | 017d1e7 | 2010-03-04 21:57:21 +1100 | [diff] [blame] | 1022 | - djm@cvs.openbsd.org 2010/03/03 00:47:23 |
| 1023 | [regress/cert-hostkey.sh regress/cert-userkey.sh] |
| 1024 | add an extra test to ensure that authentication with the wrong |
| 1025 | certificate fails as it should (and it does) |
Damien Miller | 700dcfa | 2010-03-04 21:58:01 +1100 | [diff] [blame] | 1026 | - djm@cvs.openbsd.org 2010/03/04 10:38:23 |
| 1027 | [regress/cert-hostkey.sh regress/cert-userkey.sh] |
| 1028 | additional regression tests for revoked keys and TrustedUserCAKeys |
Damien Miller | 910f209 | 2010-03-04 14:17:22 +1100 | [diff] [blame] | 1029 | |
Damien Miller | 25b97dd | 2010-03-03 10:24:00 +1100 | [diff] [blame] | 1030 | 20100303 |
| 1031 | - (djm) [PROTOCOL.certkeys] Add RCS Ident |
Damien Miller | 15f5b56 | 2010-03-03 10:25:21 +1100 | [diff] [blame] | 1032 | - OpenBSD CVS Sync |
| 1033 | - jmc@cvs.openbsd.org 2010/02/26 22:09:28 |
| 1034 | [ssh-keygen.1 ssh.1 sshd.8] |
| 1035 | tweak previous; |
Damien Miller | 0bd4186 | 2010-03-03 10:25:41 +1100 | [diff] [blame] | 1036 | - otto@cvs.openbsd.org 2010/03/01 11:07:06 |
| 1037 | [ssh-add.c] |
| 1038 | zap what seems to be a left-over debug message; ok markus@ |
Damien Miller | fb84e59 | 2010-03-03 10:26:04 +1100 | [diff] [blame] | 1039 | - djm@cvs.openbsd.org 2010/03/02 23:20:57 |
| 1040 | [ssh-keygen.c] |
| 1041 | POSIX strptime is stricter than OpenBSD's so do a little dance to |
| 1042 | appease it. |
Damien Miller | 386dbc0 | 2010-03-03 13:22:41 +1100 | [diff] [blame] | 1043 | - (djm) [regress/cert-userkey.sh] s/echo -n/echon/ here too |
Damien Miller | 25b97dd | 2010-03-03 10:24:00 +1100 | [diff] [blame] | 1044 | |
Tim Rice | c5b0cb3 | 2010-03-01 15:57:42 -0800 | [diff] [blame] | 1045 | 20100302 |
| 1046 | - (tim) [config.guess config.sub] Bug 1722: Update to latest versions from |
| 1047 | http://git.savannah.gnu.org/gitweb/ (2009-12-30 and 2010-01-22 |
| 1048 | respectively). |
| 1049 | |
Darren Tucker | c614c78 | 2010-03-01 12:49:05 +1100 | [diff] [blame] | 1050 | 20100301 |
| 1051 | - (dtucker) [regress/{cert-hostkey,cfgmatch,cipher-speed}.sh} Replace |
| 1052 | "echo -n" with "echon" for portability. |
Darren Tucker | 9af0cb9 | 2010-03-01 15:52:49 +1100 | [diff] [blame] | 1053 | - (dtucker) [openbsd-compat/port-linux.c] Make failure to write to the OOM |
| 1054 | adjust log at verbose only, since according to cjwatson in bug #1470 |
| 1055 | some virtualization platforms don't allow writes. |
Darren Tucker | c614c78 | 2010-03-01 12:49:05 +1100 | [diff] [blame] | 1056 | |
Damien Miller | acc9b29 | 2010-03-01 04:36:54 +1100 | [diff] [blame] | 1057 | 20100228 |
| 1058 | - (djm) [auth.c] On Cygwin, refuse usernames that have differences in |
| 1059 | case from that matched in the system password database. On this |
| 1060 | platform, passwords are stored case-insensitively, but sshd requires |
| 1061 | exact case matching for Match blocks in sshd_config(5). Based on |
| 1062 | a patch from vinschen AT redhat.com. |
Tim Rice | bff24b8 | 2010-02-28 14:51:56 -0800 | [diff] [blame] | 1063 | - (tim) [ssh-pkcs11-helper.c] Move declarations before calling functions |
| 1064 | to make older compilers (gcc 2.95) happy. |
Damien Miller | acc9b29 | 2010-03-01 04:36:54 +1100 | [diff] [blame] | 1065 | |
Damien Miller | 09a24db | 2010-02-28 03:28:05 +1100 | [diff] [blame] | 1066 | 20100227 |
Damien Miller | d05951f | 2010-02-28 03:29:33 +1100 | [diff] [blame] | 1067 | - (djm) [ssh-pkcs11-helper.c ] Ensure RNG is initialised and seeded |
| 1068 | - (djm) [openbsd-compat/bsd-cygwin_util.c] Reduce the set of environment |
| 1069 | variables copied into sshd child processes. From vinschen AT redhat.com |
Damien Miller | 09a24db | 2010-02-28 03:28:05 +1100 | [diff] [blame] | 1070 | |
Damien Miller | 0a80ca1 | 2010-02-27 07:55:05 +1100 | [diff] [blame] | 1071 | 20100226 |
| 1072 | - OpenBSD CVS Sync |
| 1073 | - djm@cvs.openbsd.org 2010/02/26 20:29:54 |
| 1074 | [PROTOCOL PROTOCOL.agent PROTOCOL.certkeys addrmatch.c auth-options.c] |
| 1075 | [auth-options.h auth.h auth2-pubkey.c authfd.c dns.c dns.h hostfile.c] |
| 1076 | [hostfile.h kex.h kexdhs.c kexgexs.c key.c key.h match.h monitor.c] |
| 1077 | [myproposal.h servconf.c servconf.h ssh-add.c ssh-agent.c ssh-dss.c] |
| 1078 | [ssh-keygen.1 ssh-keygen.c ssh-rsa.c ssh.1 ssh.c ssh2.h sshconnect.c] |
| 1079 | [sshconnect2.c sshd.8 sshd.c sshd_config.5] |
| 1080 | Add support for certificate key types for users and hosts. |
| 1081 | |
| 1082 | OpenSSH certificate key types are not X.509 certificates, but a much |
| 1083 | simpler format that encodes a public key, identity information and |
| 1084 | some validity constraints and signs it with a CA key. CA keys are |
| 1085 | regular SSH keys. This certificate style avoids the attack surface |
| 1086 | of X.509 certificates and is very easy to deploy. |
| 1087 | |
| 1088 | Certified host keys allow automatic acceptance of new host keys |
| 1089 | when a CA certificate is marked as trusted in ~/.ssh/known_hosts. |
| 1090 | see VERIFYING HOST KEYS in ssh(1) for details. |
| 1091 | |
| 1092 | Certified user keys allow authentication of users when the signing |
| 1093 | CA key is marked as trusted in authorized_keys. See "AUTHORIZED_KEYS |
| 1094 | FILE FORMAT" in sshd(8) for details. |
| 1095 | |
| 1096 | Certificates are minted using ssh-keygen(1), documentation is in |
| 1097 | the "CERTIFICATES" section of that manpage. |
| 1098 | |
| 1099 | Documentation on the format of certificates is in the file |
| 1100 | PROTOCOL.certkeys |
| 1101 | |
| 1102 | feedback and ok markus@ |
Damien Miller | 58ac6de | 2010-02-27 07:57:12 +1100 | [diff] [blame] | 1103 | - djm@cvs.openbsd.org 2010/02/26 20:33:21 |
| 1104 | [Makefile regress/cert-hostkey.sh regress/cert-userkey.sh] |
| 1105 | regression tests for certified keys |
Damien Miller | 0a80ca1 | 2010-02-27 07:55:05 +1100 | [diff] [blame] | 1106 | |
Damien Miller | 05abd2c | 2010-02-24 17:16:08 +1100 | [diff] [blame] | 1107 | 20100224 |
| 1108 | - (djm) [pkcs11.h ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c] |
| 1109 | [ssh-pkcs11.h] Add $OpenBSD$ RCS idents so we can sync portable |
Damien Miller | a80f140 | 2010-02-24 17:17:58 +1100 | [diff] [blame] | 1110 | - (djm) OpenBSD CVS Sync |
| 1111 | - djm@cvs.openbsd.org 2010/02/11 20:37:47 |
| 1112 | [pathnames.h] |
| 1113 | correct comment |
Damien Miller | b6bd3c2 | 2010-02-24 17:24:56 +1100 | [diff] [blame] | 1114 | - dtucker@cvs.openbsd.org 2009/11/09 04:20:04 |
| 1115 | [regress/Makefile] |
| 1116 | add regression test for ssh-keygen pubkey conversions |
Damien Miller | 0dff9c7 | 2010-02-24 17:25:58 +1100 | [diff] [blame] | 1117 | - dtucker@cvs.openbsd.org 2010/01/11 02:53:44 |
| 1118 | [regress/forwarding.sh] |
| 1119 | regress test for stdio forwarding |
Damien Miller | bb4ae55 | 2010-02-24 17:26:38 +1100 | [diff] [blame] | 1120 | - djm@cvs.openbsd.org 2010/02/09 04:57:36 |
| 1121 | [regress/addrmatch.sh] |
| 1122 | clean up droppings |
Damien Miller | 8f9492c | 2010-02-24 17:28:45 +1100 | [diff] [blame] | 1123 | - djm@cvs.openbsd.org 2010/02/09 06:29:02 |
| 1124 | [regress/Makefile] |
| 1125 | turn on all the malloc(3) checking options when running regression |
| 1126 | tests. this has caught a few bugs for me in the past; ok dtucker@ |
Damien Miller | c173921 | 2010-02-24 17:29:34 +1100 | [diff] [blame] | 1127 | - djm@cvs.openbsd.org 2010/02/24 06:21:56 |
| 1128 | [regress/test-exec.sh] |
| 1129 | wait for sshd to fully stop in cleanup() function; avoids races in tests |
| 1130 | that do multiple start_sshd/cleanup cycles; "I hate pidfiles" deraadt@ |
Damien Miller | cfa42d2 | 2010-02-24 17:31:20 +1100 | [diff] [blame] | 1131 | - markus@cvs.openbsd.org 2010/02/08 10:52:47 |
| 1132 | [regress/agent-pkcs11.sh] |
| 1133 | test for PKCS#11 support (currently disabled) |
Damien Miller | 43001b3 | 2010-02-24 18:18:51 +1100 | [diff] [blame] | 1134 | - (djm) [Makefile.in ssh-pkcs11-helper.8] Add manpage for PKCS#11 helper |
Damien Miller | d27d85d | 2010-02-24 18:21:45 +1100 | [diff] [blame] | 1135 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
| 1136 | [contrib/suse/openssh.spec] Add PKCS#11 helper binary and manpage |
Damien Miller | 05abd2c | 2010-02-24 17:16:08 +1100 | [diff] [blame] | 1137 | |
Damien Miller | 17751bc | 2010-02-12 07:35:08 +1100 | [diff] [blame] | 1138 | 20100212 |
| 1139 | - (djm) OpenBSD CVS Sync |
| 1140 | - djm@cvs.openbsd.org 2010/02/02 22:49:34 |
| 1141 | [bufaux.c] |
| 1142 | make buffer_get_string_ret() really non-fatal in all cases (it was |
| 1143 | using buffer_get_int(), which could fatal() on buffer empty); |
| 1144 | ok markus dtucker |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 1145 | - markus@cvs.openbsd.org 2010/02/08 10:50:20 |
| 1146 | [pathnames.h readconf.c readconf.h scp.1 sftp.1 ssh-add.1 ssh-add.c] |
| 1147 | [ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh.1 ssh.c ssh_config.5] |
| 1148 | replace our obsolete smartcard code with PKCS#11. |
| 1149 | ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs-11v2-20.pdf |
| 1150 | ssh(1) and ssh-keygen(1) use dlopen(3) directly to talk to a PKCS#11 |
| 1151 | provider (shared library) while ssh-agent(1) delegates PKCS#11 to |
| 1152 | a forked a ssh-pkcs11-helper process. |
| 1153 | PKCS#11 is currently a compile time option. |
| 1154 | feedback and ok djm@; inspired by patches from Alon Bar-Lev |
Damien Miller | 048dc93 | 2010-02-12 09:22:04 +1100 | [diff] [blame] | 1155 | - jmc@cvs.openbsd.org 2010/02/08 22:03:05 |
| 1156 | [ssh-add.1 ssh-keygen.1 ssh.1 ssh.c] |
| 1157 | tweak previous; ok markus |
Damien Miller | a183c6e | 2010-02-12 09:22:31 +1100 | [diff] [blame] | 1158 | - djm@cvs.openbsd.org 2010/02/09 00:50:36 |
| 1159 | [ssh-agent.c] |
| 1160 | fallout from PKCS#11: unbreak -D |
Damien Miller | 86cbb44 | 2010-02-12 09:22:57 +1100 | [diff] [blame] | 1161 | - djm@cvs.openbsd.org 2010/02/09 00:50:59 |
| 1162 | [ssh-keygen.c] |
| 1163 | fix -Wall |
Damien Miller | 8922106 | 2010-02-12 09:23:40 +1100 | [diff] [blame] | 1164 | - djm@cvs.openbsd.org 2010/02/09 03:56:28 |
| 1165 | [buffer.c buffer.h] |
| 1166 | constify the arguments to buffer_len, buffer_ptr and buffer_dump |
Damien Miller | 47cf16b | 2010-02-12 09:25:29 +1100 | [diff] [blame] | 1167 | - djm@cvs.openbsd.org 2010/02/09 06:18:46 |
| 1168 | [auth.c] |
| 1169 | unbreak ChrootDirectory+internal-sftp by skipping check for executable |
| 1170 | shell when chrooting; reported by danh AT wzrd.com; ok dtucker@ |
Damien Miller | a761844 | 2010-02-12 09:26:02 +1100 | [diff] [blame] | 1171 | - markus@cvs.openbsd.org 2010/02/10 23:20:38 |
| 1172 | [ssh-add.1 ssh-keygen.1 ssh.1 ssh_config.5] |
| 1173 | pkcs#11 is no longer optional; improve wording; ok jmc@ |
Damien Miller | d400da5 | 2010-02-12 09:26:23 +1100 | [diff] [blame] | 1174 | - jmc@cvs.openbsd.org 2010/02/11 13:23:29 |
| 1175 | [ssh.1] |
| 1176 | libarary -> library; |
Damien Miller | d8f6002 | 2010-02-12 09:34:22 +1100 | [diff] [blame] | 1177 | - (djm) [INSTALL Makefile.in README.smartcard configure.ac scard-opensc.c] |
| 1178 | [scard.c scard.h pkcs11.h scard/Makefile.in scard/Ssh.bin.uu scard/Ssh.java] |
| 1179 | Remove obsolete smartcard support |
Damien Miller | 8ad0fbd | 2010-02-12 09:49:06 +1100 | [diff] [blame] | 1180 | - (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c] |
| 1181 | Make it compile on OSX |
Damien Miller | dfa4156 | 2010-02-12 10:06:28 +1100 | [diff] [blame] | 1182 | - (djm) [ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c] |
| 1183 | Use ssh_get_progname to fill __progname |
Damien Miller | b3c9f78 | 2010-02-12 10:11:34 +1100 | [diff] [blame] | 1184 | - (djm) [configure.ac] Enable PKCS#11 support only when we find a working |
| 1185 | dlopen() |
Damien Miller | 17751bc | 2010-02-12 07:35:08 +1100 | [diff] [blame] | 1186 | |
Damien Miller | 1d2bfc4 | 2010-02-10 10:19:29 +1100 | [diff] [blame] | 1187 | 20100210 |
| 1188 | - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for |
| 1189 | getseuserbyname; patch from calebcase AT gmail.com via |
| 1190 | cjwatson AT debian.org |
| 1191 | |
Damien Miller | 74d9825 | 2010-02-02 17:01:46 +1100 | [diff] [blame] | 1192 | 20100202 |
| 1193 | - (djm) OpenBSD CVS Sync |
| 1194 | - djm@cvs.openbsd.org 2010/01/30 21:08:33 |
| 1195 | [sshd.8] |
| 1196 | debug output goes to stderr, not "the system log"; ok markus dtucker |
Damien Miller | d636943 | 2010-02-02 17:02:07 +1100 | [diff] [blame] | 1197 | - djm@cvs.openbsd.org 2010/01/30 21:12:08 |
| 1198 | [channels.c] |
| 1199 | fake local addr:port when stdio fowarding as some servers (Tectia at |
| 1200 | least) validate that they are well-formed; |
| 1201 | reported by imorgan AT nas.nasa.gov |
| 1202 | ok dtucker |
Damien Miller | 74d9825 | 2010-02-02 17:01:46 +1100 | [diff] [blame] | 1203 | |
Damien Miller | 36f57eb | 2010-01-30 17:28:34 +1100 | [diff] [blame] | 1204 | 20100130 |
| 1205 | - (djm) OpenBSD CVS Sync |
| 1206 | - djm@cvs.openbsd.org 2010/01/28 00:21:18 |
| 1207 | [clientloop.c] |
| 1208 | downgrade an error() to a debug() - this particular case can be hit in |
| 1209 | normal operation for certain sequences of mux slave vs session closure |
| 1210 | and is harmless |
Damien Miller | 133d9d3 | 2010-01-30 17:30:04 +1100 | [diff] [blame] | 1211 | - djm@cvs.openbsd.org 2010/01/29 00:20:41 |
| 1212 | [sshd.c] |
| 1213 | set FD_CLOEXEC on sock_in/sock_out; bz#1706 from jchadima AT redhat.com |
| 1214 | ok dtucker@ |
Damien Miller | 0dac03f | 2010-01-30 17:36:33 +1100 | [diff] [blame] | 1215 | - djm@cvs.openbsd.org 2010/01/29 20:16:17 |
| 1216 | [mux.c] |
| 1217 | kill correct channel (was killing already-dead mux channel, not |
| 1218 | its session channel) |
Damien Miller | c3ca35f | 2010-01-30 17:42:01 +1100 | [diff] [blame] | 1219 | - djm@cvs.openbsd.org 2010/01/30 02:54:53 |
| 1220 | [mux.c] |
| 1221 | don't mark channel as read failed if it is already closing; suppresses |
| 1222 | harmless error messages when connecting to SSH.COM Tectia server |
| 1223 | report by imorgan AT nas.nasa.gov |
Damien Miller | 36f57eb | 2010-01-30 17:28:34 +1100 | [diff] [blame] | 1224 | |
Darren Tucker | 19d32cb | 2010-01-29 10:54:11 +1100 | [diff] [blame] | 1225 | 20100129 |
| 1226 | - (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config() |
| 1227 | after registering the hardware engines, which causes the openssl.cnf file to |
| 1228 | be processed. See OpenSSL's man page for OPENSSL_config(3) for details. |
| 1229 | Patch from Solomon Peachy, ok djm@. |
| 1230 | |
Damien Miller | 45a81a0 | 2010-01-28 06:26:20 +1100 | [diff] [blame] | 1231 | 20100128 |
| 1232 | - (djm) OpenBSD CVS Sync |
| 1233 | - djm@cvs.openbsd.org 2010/01/26 02:15:20 |
| 1234 | [mux.c] |
| 1235 | -Wuninitialized and remove a // comment; from portable |
| 1236 | (Id sync only) |
Damien Miller | a21cdfa | 2010-01-28 06:26:59 +1100 | [diff] [blame] | 1237 | - djm@cvs.openbsd.org 2010/01/27 13:26:17 |
| 1238 | [mux.c] |
| 1239 | fix bug introduced in mux rewrite: |
| 1240 | |
| 1241 | In a mux master, when a socket to a mux slave closes before its server |
| 1242 | session (as may occur when the slave has been signalled), gracefully |
| 1243 | close the server session rather than deleting its channel immediately. |
| 1244 | A server may have more messages on that channel to send (e.g. an exit |
| 1245 | message) that will fatal() the client if they are sent to a channel that |
| 1246 | has been prematurely deleted. |
| 1247 | |
| 1248 | spotted by imorgan AT nas.nasa.gov |
Damien Miller | a116298 | 2010-01-28 06:27:54 +1100 | [diff] [blame] | 1249 | - djm@cvs.openbsd.org 2010/01/27 19:21:39 |
| 1250 | [sftp.c] |
| 1251 | add missing "p" flag to getopt optstring; |
| 1252 | bz#1704 from imorgan AT nas.nasa.gov |
Damien Miller | 45a81a0 | 2010-01-28 06:26:20 +1100 | [diff] [blame] | 1253 | |
Damien Miller | 2e68d79 | 2010-01-26 12:51:13 +1100 | [diff] [blame] | 1254 | 20100126 |
| 1255 | - (djm) OpenBSD CVS Sync |
| 1256 | - tedu@cvs.openbsd.org 2010/01/17 21:49:09 |
| 1257 | [ssh-agent.1] |
| 1258 | Correct and clarify ssh-add's password asking behavior. |
| 1259 | Improved text dtucker and ok jmc |
Damien Miller | f589fd1 | 2010-01-26 12:53:06 +1100 | [diff] [blame] | 1260 | - dtucker@cvs.openbsd.org 2010/01/18 01:50:27 |
| 1261 | [roaming_client.c] |
| 1262 | s/long long unsigned/unsigned long long/, from tim via portable |
| 1263 | (Id sync only, change already in portable) |
Damien Miller | e1537f9 | 2010-01-26 13:26:22 +1100 | [diff] [blame] | 1264 | - djm@cvs.openbsd.org 2010/01/26 01:28:35 |
| 1265 | [channels.c channels.h clientloop.c clientloop.h mux.c nchan.c ssh.c] |
| 1266 | rewrite ssh(1) multiplexing code to a more sensible protocol. |
| 1267 | |
| 1268 | The new multiplexing code uses channels for the listener and |
| 1269 | accepted control sockets to make the mux master non-blocking, so |
| 1270 | no stalls when processing messages from a slave. |
| 1271 | |
| 1272 | avoid use of fatal() in mux master protocol parsing so an errant slave |
| 1273 | process cannot take down a running master. |
| 1274 | |
| 1275 | implement requesting of port-forwards over multiplexed sessions. Any |
| 1276 | port forwards requested by the slave are added to those the master has |
| 1277 | established. |
| 1278 | |
| 1279 | add support for stdio forwarding ("ssh -W host:port ...") in mux slaves. |
| 1280 | |
| 1281 | document master/slave mux protocol so that other tools can use it to |
| 1282 | control a running ssh(1). Note: there are no guarantees that this |
| 1283 | protocol won't be incompatibly changed (though it is versioned). |
| 1284 | |
| 1285 | feedback Salvador Fandino, dtucker@ |
| 1286 | channel changes ok markus@ |
Damien Miller | 2e68d79 | 2010-01-26 12:51:13 +1100 | [diff] [blame] | 1287 | |
Tim Rice | 6761c74 | 2010-01-22 10:25:15 -0800 | [diff] [blame] | 1288 | 20100122 |
| 1289 | - (tim) [configure.ac] Due to constraints in Windows Sockets in terms of |
| 1290 | socket inheritance, reduce the default SO_RCVBUF/SO_SNDBUF buffer size |
| 1291 | in Cygwin to 65535. Patch from Corinna Vinschen. |
| 1292 | |
Tim Rice | 7ab7b93 | 2010-01-17 12:48:22 -0800 | [diff] [blame] | 1293 | 20100117 |
| 1294 | - (tim) [configure.ac] OpenServer 5 needs BROKEN_GETADDRINFO too. |
Tim Rice | 7bb7471 | 2010-01-17 22:49:57 -0800 | [diff] [blame] | 1295 | - (tim) [configure.ac] On SVR5 systems, use the C99-conforming functions |
| 1296 | snprintf() and vsnprintf() named _xsnprintf() and _xvsnprintf(). |
Tim Rice | 7ab7b93 | 2010-01-17 12:48:22 -0800 | [diff] [blame] | 1297 | |
Darren Tucker | ca94485 | 2010-01-16 11:48:27 +1100 | [diff] [blame] | 1298 | 20100116 |
| 1299 | - (dtucker) [openbsd-compat/pwcache.c] Pull in includes.h and thus defines.h |
| 1300 | so we correctly detect whether or not we have a native user_from_uid. |
Darren Tucker | 2563e3f | 2010-01-16 11:53:07 +1100 | [diff] [blame] | 1301 | - (dtucker) [openbsd-compat/openbsd-compat.h] Prototypes for user_from_uid |
| 1302 | and group_from_gid. |
Darren Tucker | 69371b5 | 2010-01-16 13:30:30 +1100 | [diff] [blame] | 1303 | - (dtucker) [openbsd-compat/openbsd-compat.h] Fix prototypes, spotted by |
| 1304 | Tim. |
Darren Tucker | dab129b | 2010-01-16 13:43:50 +1100 | [diff] [blame] | 1305 | - (dtucker) OpenBSD CVS Sync |
| 1306 | - markus@cvs.openbsd.org 2010/01/15 09:24:23 |
| 1307 | [sftp-common.c] |
| 1308 | unused |
Darren Tucker | 612e400 | 2010-01-16 13:53:52 +1100 | [diff] [blame] | 1309 | - (dtucker) [openbsd-compat/pwcache.c] Shrink ifdef area to prevent unused |
| 1310 | variable warnings. |
Darren Tucker | 4e21855 | 2010-01-16 23:58:37 +1100 | [diff] [blame] | 1311 | - (dtucker) [openbsd-compat/openbsd-compat.h] Typo. |
Tim Rice | 999aaf4 | 2010-01-16 11:37:53 -0800 | [diff] [blame] | 1312 | - (tim) [regress/portnum.sh] Shell portability fix. |
Tim Rice | 4a7db1c | 2010-01-16 12:23:25 -0800 | [diff] [blame] | 1313 | - (tim) [configure.ac] Define BROKEN_GETADDRINFO on SVR5 systems. The native |
| 1314 | getaddrinfo() is too old and limited for addr_pton() in addrmatch.c. |
Tim Rice | 33e48ac | 2010-01-17 07:12:40 -0800 | [diff] [blame] | 1315 | - (tim) [roaming_client.c] Use of <sys/queue.h> is not really portable so we |
| 1316 | use "openbsd-compat/sys-queue.h". s/long long unsigned/unsigned long long/ |
| 1317 | to keep USL compilers happy. |
Darren Tucker | ca94485 | 2010-01-16 11:48:27 +1100 | [diff] [blame] | 1318 | |
Darren Tucker | 75fe626 | 2010-01-15 11:42:51 +1100 | [diff] [blame] | 1319 | 20100115 |
| 1320 | - (dtucker) OpenBSD CVS Sync |
| 1321 | - jmc@cvs.openbsd.org 2010/01/13 12:48:34 |
| 1322 | [sftp.1 sftp.c] |
| 1323 | sftp.1: put ls -h in the right place |
| 1324 | sftp.c: as above, plus add -p to get/put, and shorten their arg names |
| 1325 | to keep the help usage nicely aligned |
| 1326 | ok djm |
Darren Tucker | 94881d8 | 2010-01-15 11:44:46 +1100 | [diff] [blame] | 1327 | - djm@cvs.openbsd.org 2010/01/13 23:47:26 |
| 1328 | [auth.c] |
| 1329 | when using ChrootDirectory, make sure we test for the existence of the |
| 1330 | user's shell inside the chroot; bz #1679, patch from alex AT rtfs.hu; |
| 1331 | ok dtucker |
Darren Tucker | a788de2 | 2010-01-15 11:45:33 +1100 | [diff] [blame] | 1332 | - dtucker@cvs.openbsd.org 2010/01/14 23:41:49 |
| 1333 | [sftp-common.c] |
| 1334 | use user_from{uid,gid} to lookup up ids since it keeps a small cache. |
| 1335 | ok djm |
Darren Tucker | b8b17e9 | 2010-01-15 11:46:03 +1100 | [diff] [blame] | 1336 | - guenther@cvs.openbsd.org 2010/01/15 00:05:22 |
| 1337 | [sftp.c] |
| 1338 | Reset SIGTERM to SIG_DFL before executing ssh, so that even if sftp |
| 1339 | inherited SIGTERM as ignored it will still be able to kill the ssh it |
| 1340 | starts. |
| 1341 | ok dtucker@ |
Darren Tucker | 7fa3a85 | 2010-01-15 13:12:10 +1100 | [diff] [blame] | 1342 | - (dtucker) [openbsd-compat/pwcache.c] Pull in pwcache.c from OpenBSD (no |
Darren Tucker | 9d1fd5b | 2010-01-15 12:14:45 +1100 | [diff] [blame] | 1343 | changes yet but there will be some to come). |
Darren Tucker | 909a390 | 2010-01-15 12:38:30 +1100 | [diff] [blame] | 1344 | - (dtucker) [configure.ac openbsd-compat/{Makefile.in,pwcache.c} Portability |
| 1345 | for pwcache. Also, added caching of negative hits. |
Darren Tucker | 75fe626 | 2010-01-15 11:42:51 +1100 | [diff] [blame] | 1346 | |
Damien Miller | 6abc9f6 | 2010-01-14 12:44:16 +1100 | [diff] [blame] | 1347 | 20100114 |
| 1348 | - (djm) [platform.h] Add missing prototype for |
| 1349 | platform_krb5_get_principal_name |
| 1350 | |
Darren Tucker | a8f20cf | 2010-01-13 10:54:46 +1100 | [diff] [blame] | 1351 | 20100113 |
| 1352 | - (dtucker) [monitor_fdpass.c] Wrap poll.h include in ifdefs. |
Darren Tucker | ab3c2ca | 2010-01-13 18:27:32 +1100 | [diff] [blame] | 1353 | - (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18: |
| 1354 | missing restore of SIGTTOU and some whitespace. |
Darren Tucker | 1035cb4 | 2010-01-13 18:32:59 +1100 | [diff] [blame] | 1355 | - (dtucker) [openbsd-compat/readpassphrase.c] Update to OpenBSD's r1.21. |
Darren Tucker | d59487a | 2010-01-13 21:32:44 +1100 | [diff] [blame] | 1356 | - (dtucker) [openbsd-compat/readpassphrase.c] Update to OpenBSD's r1.22. |
| 1357 | Fixes bz #1590, where sometimes you could not interrupt a connection while |
| 1358 | ssh was prompting for a passphrase or password. |
Darren Tucker | e2b3674 | 2010-01-13 22:42:34 +1100 | [diff] [blame] | 1359 | - (dtucker) OpenBSD CVS Sync |
| 1360 | - dtucker@cvs.openbsd.org 2010/01/13 00:19:04 |
| 1361 | [sshconnect.c auth.c] |
| 1362 | Fix a couple of typos/mispellings in comments |
Darren Tucker | 561724f | 2010-01-13 22:43:05 +1100 | [diff] [blame] | 1363 | - dtucker@cvs.openbsd.org 2010/01/13 01:10:56 |
| 1364 | [key.c] |
| 1365 | Ignore and log any Protocol 1 keys where the claimed size is not equal to |
| 1366 | the actual size. Noted by Derek Martin, ok djm@ |
Darren Tucker | daaa450 | 2010-01-13 22:43:33 +1100 | [diff] [blame] | 1367 | - dtucker@cvs.openbsd.org 2010/01/13 01:20:20 |
| 1368 | [canohost.c ssh-keysign.c sshconnect2.c] |
| 1369 | Make HostBased authentication work with a ProxyCommand. bz #1569, patch |
| 1370 | from imorgan at nas nasa gov, ok djm@ |
Darren Tucker | 2901e2d | 2010-01-13 22:44:06 +1100 | [diff] [blame] | 1371 | - djm@cvs.openbsd.org 2010/01/13 01:40:16 |
| 1372 | [sftp.c sftp-server.c sftp.1 sftp-common.c sftp-common.h] |
| 1373 | support '-h' (human-readable units) for sftp's ls command, just like |
| 1374 | ls(1); ok dtucker@ |
Darren Tucker | 88b6fb2 | 2010-01-13 22:44:29 +1100 | [diff] [blame] | 1375 | - djm@cvs.openbsd.org 2010/01/13 03:48:13 |
| 1376 | [servconf.c servconf.h sshd.c] |
| 1377 | avoid run-time failures when specifying hostkeys via a relative |
| 1378 | path by prepending the cwd in these cases; bz#1290; ok dtucker@ |
Darren Tucker | 9c3ba07 | 2010-01-13 22:45:03 +1100 | [diff] [blame] | 1379 | - djm@cvs.openbsd.org 2010/01/13 04:10:50 |
| 1380 | [sftp.c] |
| 1381 | don't append a space after inserting a completion of a directory (i.e. |
| 1382 | a path ending in '/') for a slightly better user experience; ok dtucker@ |
Darren Tucker | 096630d | 2010-01-13 23:00:38 +1100 | [diff] [blame] | 1383 | - (dtucker) [sftp-common.c] Wrap include of util.h in an ifdef. |
Tim Rice | d4a7fcb | 2010-01-13 15:44:34 -0800 | [diff] [blame] | 1384 | - (tim) [defines.h] openbsd-compat/readpassphrase.c now needs _NSIG. |
| 1385 | feedback and ok dtucker@ |
Darren Tucker | a8f20cf | 2010-01-13 10:54:46 +1100 | [diff] [blame] | 1386 | |
Darren Tucker | 09aa4c0 | 2010-01-12 19:51:48 +1100 | [diff] [blame] | 1387 | 20100112 |
Darren Tucker | 7ad8dd2 | 2010-01-12 19:40:27 +1100 | [diff] [blame] | 1388 | - (dtucker) OpenBSD CVS Sync |
| 1389 | - dtucker@cvs.openbsd.org 2010/01/11 01:39:46 |
| 1390 | [ssh_config channels.c ssh.1 channels.h ssh.c] |
| 1391 | Add a 'netcat mode' (ssh -W). This connects stdio on the client to a |
| 1392 | single port forward on the server. This allows, for example, using ssh as |
| 1393 | a ProxyCommand to route connections via intermediate servers. |
| 1394 | bz #1618, man page help from jmc@, ok markus@ |
Darren Tucker | d4c86b1 | 2010-01-12 19:41:22 +1100 | [diff] [blame] | 1395 | - dtucker@cvs.openbsd.org 2010/01/11 04:46:45 |
| 1396 | [authfile.c sshconnect2.c] |
| 1397 | Do not prompt for a passphrase if we fail to open a keyfile, and log the |
| 1398 | reason the open failed to debug. |
| 1399 | bz #1693, found by tj AT castaglia org, ok djm@ |
Darren Tucker | d04758d | 2010-01-12 19:41:57 +1100 | [diff] [blame] | 1400 | - djm@cvs.openbsd.org 2010/01/11 10:51:07 |
| 1401 | [ssh-keygen.c] |
| 1402 | when converting keys, truncate key comments at 72 chars as per RFC4716; |
| 1403 | bz#1630 reported by tj AT castaglia.org; ok markus@ |
Darren Tucker | 69c01b1 | 2010-01-12 19:42:29 +1100 | [diff] [blame] | 1404 | - dtucker@cvs.openbsd.org 2010/01/12 00:16:47 |
| 1405 | [authfile.c] |
| 1406 | Fix bug introduced in r1.78 (incorrect brace location) that broke key auth. |
| 1407 | Patch from joachim joachimschipper nl. |
Darren Tucker | e371a13 | 2010-01-12 19:43:12 +1100 | [diff] [blame] | 1408 | - djm@cvs.openbsd.org 2010/01/12 00:58:25 |
| 1409 | [monitor_fdpass.c] |
| 1410 | avoid spinning when fd passing on nonblocking sockets by calling poll() |
| 1411 | in the EINTR/EAGAIN path, much like we do in atomicio; ok dtucker@ |
Darren Tucker | c6cc90b | 2010-01-12 19:43:46 +1100 | [diff] [blame] | 1412 | - djm@cvs.openbsd.org 2010/01/12 00:59:29 |
| 1413 | [roaming_common.c] |
| 1414 | delete with extreme prejudice a debug() that fired with every keypress; |
| 1415 | ok dtucker deraadt |
Darren Tucker | 1b0c245 | 2010-01-12 19:45:26 +1100 | [diff] [blame] | 1416 | - dtucker@cvs.openbsd.org 2010/01/12 01:31:05 |
| 1417 | [session.c] |
| 1418 | Do not allow logins if /etc/nologin exists but is not readable by the user |
| 1419 | logging in. Noted by Jan.Pechanec at Sun, ok djm@ deraadt@ |
Darren Tucker | ebc71d9 | 2010-01-12 19:45:59 +1100 | [diff] [blame] | 1420 | - djm@cvs.openbsd.org 2010/01/12 01:36:08 |
| 1421 | [buffer.h bufaux.c] |
| 1422 | add a buffer_get_string_ptr_ret() that does the same as |
| 1423 | buffer_get_string_ptr() but does not fatal() on error; ok dtucker@ |
Darren Tucker | 09aa4c0 | 2010-01-12 19:51:48 +1100 | [diff] [blame] | 1424 | - dtucker@cvs.openbsd.org 2010/01/12 08:33:17 |
| 1425 | [session.c] |
| 1426 | Add explicit stat so we reliably detect nologin with bad perms. |
| 1427 | ok djm markus |
Darren Tucker | 7ad8dd2 | 2010-01-12 19:40:27 +1100 | [diff] [blame] | 1428 | |
| 1429 | 20100110 |
Darren Tucker | 8c65f64 | 2010-01-10 10:26:57 +1100 | [diff] [blame] | 1430 | - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] |
| 1431 | Remove hacks add for RoutingDomain in preparation for its removal. |
Darren Tucker | d330045 | 2010-01-10 19:26:43 +1100 | [diff] [blame] | 1432 | - (dtucker) OpenBSD CVS Sync |
Darren Tucker | 7bd98e7 | 2010-01-10 10:31:12 +1100 | [diff] [blame] | 1433 | - dtucker@cvs.openbsd.org 2010/01/09 23:04:13 |
| 1434 | [channels.c ssh.1 servconf.c sshd_config.5 sshd.c channels.h servconf.h |
| 1435 | ssh-keyscan.1 ssh-keyscan.c readconf.c sshconnect.c misc.c ssh.c |
| 1436 | readconf.h scp.1 sftp.1 ssh_config.5 misc.h] |
| 1437 | Remove RoutingDomain from ssh since it's now not needed. It can be |
| 1438 | replaced with "route exec" or "nc -V" as a proxycommand. "route exec" |
| 1439 | also ensures that trafic such as DNS lookups stays withing the specified |
| 1440 | routingdomain. For example (from reyk): |
| 1441 | # route -T 2 exec /usr/sbin/sshd |
| 1442 | or inherited from the parent process |
| 1443 | $ route -T 2 exec sh |
| 1444 | $ ssh 10.1.2.3 |
| 1445 | ok deraadt@ markus@ stevesk@ reyk@ |
Darren Tucker | d330045 | 2010-01-10 19:26:43 +1100 | [diff] [blame] | 1446 | - dtucker@cvs.openbsd.org 2010/01/10 03:51:17 |
| 1447 | [servconf.c] |
| 1448 | Add ChrootDirectory to sshd.c test-mode output |
Darren Tucker | 4355152 | 2010-01-10 19:27:17 +1100 | [diff] [blame] | 1449 | - dtucker@cvs.openbsd.org 2010/01/10 07:15:56 |
| 1450 | [auth.c] |
| 1451 | Output a debug if we can't open an existing keyfile. bz#1694, ok djm@ |
Darren Tucker | 8c65f64 | 2010-01-10 10:26:57 +1100 | [diff] [blame] | 1452 | |
Darren Tucker | 7ad8dd2 | 2010-01-12 19:40:27 +1100 | [diff] [blame] | 1453 | 20100109 |
Darren Tucker | 9eba40c | 2010-01-09 09:02:07 +1100 | [diff] [blame] | 1454 | - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't |
| 1455 | have it. |
Darren Tucker | 709d0ce | 2010-01-09 09:25:54 +1100 | [diff] [blame] | 1456 | - (dtucker) [defines.h] define PRIu64 for platforms that don't have it. |
Darren Tucker | 11b5c07 | 2010-01-09 16:40:48 +1100 | [diff] [blame] | 1457 | - (dtucker) [roaming_client.c] Wrap inttypes.h in an ifdef. |
Darren Tucker | 0b8a226 | 2010-01-09 18:18:04 +1100 | [diff] [blame] | 1458 | - (dtucker) [loginrec.c] Use the SUSv3 specified name for the user name |
| 1459 | when using utmpx. Patch from Ed Schouten. |
Darren Tucker | db7bf82 | 2010-01-09 22:24:33 +1100 | [diff] [blame] | 1460 | - (dtucker) OpenBSD CVS Sync |
| 1461 | - djm@cvs.openbsd.org 2010/01/09 00:20:26 |
| 1462 | [sftp-server.c sftp-server.8] |
| 1463 | add a 'read-only' mode to sftp-server(8) that disables open in write mode |
| 1464 | and all other fs-modifying protocol methods. bz#430 ok dtucker@ |
Darren Tucker | a2e1048 | 2010-01-09 22:25:14 +1100 | [diff] [blame] | 1465 | - djm@cvs.openbsd.org 2010/01/09 00:57:10 |
| 1466 | [PROTOCOL] |
| 1467 | tweak language |
Darren Tucker | 838891f | 2010-01-09 22:25:46 +1100 | [diff] [blame] | 1468 | - jmc@cvs.openbsd.org 2010/01/09 03:36:00 |
| 1469 | [sftp-server.8] |
| 1470 | bad place to forget a comma... |
Darren Tucker | 37c1b3d | 2010-01-09 22:26:23 +1100 | [diff] [blame] | 1471 | - djm@cvs.openbsd.org 2010/01/09 05:04:24 |
| 1472 | [mux.c sshpty.h clientloop.c sshtty.c] |
| 1473 | quell tc[gs]etattr warnings when forcing a tty (ssh -tt), since we |
| 1474 | usually don't actually have a tty to read/set; bz#1686 ok dtucker@ |
Darren Tucker | 4b28251 | 2010-01-09 22:27:06 +1100 | [diff] [blame] | 1475 | - dtucker@cvs.openbsd.org 2010/01/09 05:17:00 |
| 1476 | [roaming_client.c] |
| 1477 | Remove a PRIu64 format string that snuck in with roaming. ok djm@ |
Darren Tucker | 70cc092 | 2010-01-09 22:28:03 +1100 | [diff] [blame] | 1478 | - dtucker@cvs.openbsd.org 2010/01/09 11:13:02 |
| 1479 | [sftp.c] |
| 1480 | Prevent sftp from derefing a null pointer when given a "-" without a |
| 1481 | command. Also, allow whitespace to follow a "-". bz#1691, path from |
| 1482 | Colin Watson via Debian. ok djm@ deraadt@ |
Darren Tucker | 2c671bf | 2010-01-09 22:28:43 +1100 | [diff] [blame] | 1483 | - dtucker@cvs.openbsd.org 2010/01/09 11:17:56 |
| 1484 | [sshd.c] |
| 1485 | Afer sshd receives a SIGHUP, ignore subsequent HUPs while sshd re-execs |
| 1486 | itself. Prevents two HUPs in quick succession from resulting in sshd |
| 1487 | dying. bz#1692, patch from Colin Watson via Ubuntu. |
Darren Tucker | 269275c | 2010-01-09 22:33:37 +1100 | [diff] [blame] | 1488 | - (dtucker) [defines.h] Remove now-undeeded PRIu64 define. |
Darren Tucker | 9eba40c | 2010-01-09 09:02:07 +1100 | [diff] [blame] | 1489 | |
Darren Tucker | 7ad8dd2 | 2010-01-12 19:40:27 +1100 | [diff] [blame] | 1490 | 20100108 |
Darren Tucker | b7b17be | 2010-01-08 16:49:52 +1100 | [diff] [blame] | 1491 | - (dtucker) OpenBSD CVS Sync |
| 1492 | - andreas@cvs.openbsd.org 2009/10/24 11:11:58 |
| 1493 | [roaming.h] |
| 1494 | Declarations needed for upcoming changes. |
| 1495 | ok markus@ |
Darren Tucker | 36331b5 | 2010-01-08 16:50:41 +1100 | [diff] [blame] | 1496 | - andreas@cvs.openbsd.org 2009/10/24 11:13:54 |
| 1497 | [sshconnect2.c kex.h kex.c] |
| 1498 | Let the client detect if the server supports roaming by looking |
| 1499 | for the resume@appgate.com kex algorithm. |
| 1500 | ok markus@ |
Darren Tucker | e32cf43 | 2010-01-08 16:51:40 +1100 | [diff] [blame] | 1501 | - andreas@cvs.openbsd.org 2009/10/24 11:15:29 |
| 1502 | [clientloop.c] |
| 1503 | client_loop() must detect if the session has been suspended and resumed, |
| 1504 | and take appropriate action in that case. |
| 1505 | From Martin Forssen, maf at appgate dot com |
Darren Tucker | f9e6eb8 | 2010-01-08 16:52:32 +1100 | [diff] [blame] | 1506 | - andreas@cvs.openbsd.org 2009/10/24 11:19:17 |
| 1507 | [ssh2.h] |
| 1508 | Define the KEX messages used when resuming a suspended connection. |
Darren Tucker | e32cf43 | 2010-01-08 16:51:40 +1100 | [diff] [blame] | 1509 | ok markus@ |
Darren Tucker | e730118 | 2010-01-08 16:53:31 +1100 | [diff] [blame] | 1510 | - andreas@cvs.openbsd.org 2009/10/24 11:22:37 |
| 1511 | [roaming_common.c] |
| 1512 | Do the actual suspend/resume in the client. This won't be useful until |
| 1513 | the server side supports roaming. |
| 1514 | Most code from Martin Forssen, maf at appgate dot com. Some changes by |
| 1515 | me and markus@ |
| 1516 | ok markus@ |
Darren Tucker | f1de4e5 | 2010-01-08 16:54:59 +1100 | [diff] [blame] | 1517 | - andreas@cvs.openbsd.org 2009/10/24 11:23:42 |
| 1518 | [ssh.c] |
| 1519 | Request roaming to be enabled if UseRoaming is true and the server |
| 1520 | supports it. |
| 1521 | ok markus@ |
Darren Tucker | 34e314d | 2010-01-08 17:03:46 +1100 | [diff] [blame] | 1522 | - reyk@cvs.openbsd.org 2009/10/28 16:38:18 |
| 1523 | [ssh_config.5 sshd.c misc.h ssh-keyscan.1 readconf.h sshconnect.c |
| 1524 | channels.c channels.h servconf.h servconf.c ssh.1 ssh-keyscan.c scp.1 |
| 1525 | sftp.1 sshd_config.5 readconf.c ssh.c misc.c] |
| 1526 | Allow to set the rdomain in ssh/sftp/scp/sshd and ssh-keyscan. |
| 1527 | ok markus@ |
Darren Tucker | cc117f0 | 2010-01-08 17:05:26 +1100 | [diff] [blame] | 1528 | - jmc@cvs.openbsd.org 2009/10/28 21:45:08 |
| 1529 | [sshd_config.5 sftp.1] |
| 1530 | tweak previous; |
Darren Tucker | 78be8c5 | 2010-01-08 17:05:59 +1100 | [diff] [blame] | 1531 | - djm@cvs.openbsd.org 2009/11/10 02:56:22 |
| 1532 | [ssh_config.5] |
| 1533 | explain the constraints on LocalCommand some more so people don't |
| 1534 | try to abuse it. |
Darren Tucker | f788a91 | 2010-01-08 17:06:47 +1100 | [diff] [blame] | 1535 | - djm@cvs.openbsd.org 2009/11/10 02:58:56 |
| 1536 | [sshd_config.5] |
| 1537 | clarify that StrictModes does not apply to ChrootDirectory. Permissions |
| 1538 | and ownership are always checked when chrooting. bz#1532 |
Darren Tucker | 6e7fe1c | 2010-01-08 17:07:22 +1100 | [diff] [blame] | 1539 | - dtucker@cvs.openbsd.org 2009/11/10 04:30:45 |
| 1540 | [sshconnect2.c channels.c sshconnect.c] |
| 1541 | Set close-on-exec on various descriptors so they don't get leaked to |
| 1542 | child processes. bz #1643, patch from jchadima at redhat, ok deraadt. |
Darren Tucker | 876045b | 2010-01-08 17:08:00 +1100 | [diff] [blame] | 1543 | - markus@cvs.openbsd.org 2009/11/11 21:37:03 |
| 1544 | [channels.c channels.h] |
| 1545 | fix race condition in x11/agent channel allocation: don't read after |
| 1546 | the end of the select read/write fdset and make sure a reused FD |
| 1547 | is not touched before the pre-handlers are called. |
| 1548 | with and ok djm@ |
Darren Tucker | 2944082 | 2010-01-08 17:08:35 +1100 | [diff] [blame] | 1549 | - djm@cvs.openbsd.org 2009/11/17 05:31:44 |
| 1550 | [clientloop.c] |
| 1551 | fix incorrect exit status when multiplexing and channel ID 0 is recycled |
| 1552 | bz#1570 reported by peter.oliver AT eon-is.co.uk; ok dtucker |
Darren Tucker | d6b06a9 | 2010-01-08 17:09:11 +1100 | [diff] [blame] | 1553 | - djm@cvs.openbsd.org 2009/11/19 23:39:50 |
| 1554 | [session.c] |
| 1555 | bz#1606: error when an attempt is made to connect to a server |
| 1556 | with ForceCommand=internal-sftp with a shell session (i.e. not a |
| 1557 | subsystem session). Avoids stuck client when attempting to ssh to such a |
| 1558 | service. ok dtucker@ |
Darren Tucker | c3dc404 | 2010-01-08 17:09:50 +1100 | [diff] [blame] | 1559 | - dtucker@cvs.openbsd.org 2009/11/20 00:15:41 |
| 1560 | [session.c] |
| 1561 | Warn but do not fail if stat()ing the subsystem binary fails. This helps |
| 1562 | with chrootdirectory+forcecommand=sftp-server and restricted shells. |
| 1563 | bz #1599, ok djm. |
Darren Tucker | 2106319 | 2010-01-08 17:10:36 +1100 | [diff] [blame] | 1564 | - djm@cvs.openbsd.org 2009/11/20 00:54:01 |
| 1565 | [sftp.c] |
| 1566 | bz#1588 change "Connecting to host..." message to "Connected to host." |
| 1567 | and delay it until after the sftp protocol connection has been established. |
| 1568 | Avoids confusing sequence of messages when the underlying ssh connection |
| 1569 | experiences problems. ok dtucker@ |
Darren Tucker | ab79169 | 2010-01-08 18:48:02 +1100 | [diff] [blame] | 1570 | - dtucker@cvs.openbsd.org 2009/11/20 00:59:36 |
| 1571 | [sshconnect2.c] |
| 1572 | Use the HostKeyAlias when prompting for passwords. bz#1039, ok djm@ |
Darren Tucker | 70d8769 | 2010-01-08 18:49:16 +1100 | [diff] [blame] | 1573 | - djm@cvs.openbsd.org 2009/11/20 03:24:07 |
| 1574 | [misc.c] |
| 1575 | correct off-by-one in percent_expand(): we would fatal() when trying |
| 1576 | to expand EXPAND_MAX_KEYS, allowing only EXPAND_MAX_KEYS-1 to actually |
| 1577 | work. Note that nothing in OpenSSH actually uses close to this limit at |
| 1578 | present. bz#1607 from Jan.Pechanec AT Sun.COM |
Darren Tucker | c4dc4f5 | 2010-01-08 18:50:04 +1100 | [diff] [blame] | 1579 | - halex@cvs.openbsd.org 2009/11/22 13:18:00 |
| 1580 | [sftp.c] |
| 1581 | make passing of zero-length arguments to ssh safe by |
| 1582 | passing "-<switch>" "<value>" rather than "-<switch><value>" |
| 1583 | ok dtucker@, guenther@, djm@ |
Darren Tucker | 5246df4 | 2010-01-08 18:50:46 +1100 | [diff] [blame] | 1584 | - dtucker@cvs.openbsd.org 2009/12/06 23:41:15 |
| 1585 | [sshconnect2.c] |
| 1586 | zap unused variable and strlen; from Steve McClellan, ok djm |
Darren Tucker | 75694db | 2010-01-08 18:51:14 +1100 | [diff] [blame] | 1587 | - djm@cvs.openbsd.org 2009/12/06 23:53:45 |
| 1588 | [roaming_common.c] |
| 1589 | use socklen_t for getsockopt optlen parameter; reported by |
| 1590 | Steve.McClellan AT radisys.com, ok dtucker@ |
Darren Tucker | b5082e9 | 2010-01-08 18:51:47 +1100 | [diff] [blame] | 1591 | - dtucker@cvs.openbsd.org 2009/12/06 23:53:54 |
| 1592 | [sftp.c] |
| 1593 | fix potential divide-by-zero in sftp's "df" output when talking to a server |
| 1594 | that reports zero files on the filesystem (Unix filesystems always have at |
| 1595 | least the root inode). From Steve McClellan at radisys, ok djm@ |
Darren Tucker | 57e0d01 | 2010-01-08 18:52:27 +1100 | [diff] [blame] | 1596 | - markus@cvs.openbsd.org 2009/12/11 18:16:33 |
| 1597 | [key.c] |
| 1598 | switch from 35 to the more common value of RSA_F4 == (2**16)+1 == 65537 |
| 1599 | for the RSA public exponent; discussed with provos; ok djm@ |
Darren Tucker | b8c884a | 2010-01-08 18:53:43 +1100 | [diff] [blame] | 1600 | - guenther@cvs.openbsd.org 2009/12/20 07:28:36 |
| 1601 | [ssh.c sftp.c scp.c] |
| 1602 | When passing user-controlled options with arguments to other programs, |
| 1603 | pass the option and option argument as separate argv entries and |
| 1604 | not smashed into one (e.g., as -l foo and not -lfoo). Also, always |
| 1605 | pass a "--" argument to stop option parsing, so that a positional |
| 1606 | argument that starts with a '-' isn't treated as an option. This |
| 1607 | fixes some error cases as well as the handling of hostnames and |
| 1608 | filenames that start with a '-'. |
| 1609 | Based on a diff by halex@ |
| 1610 | ok halex@ djm@ deraadt@ |
Darren Tucker | f2705c8 | 2010-01-08 18:54:17 +1100 | [diff] [blame] | 1611 | - djm@cvs.openbsd.org 2009/12/20 23:20:40 |
| 1612 | [PROTOCOL] |
| 1613 | fix an incorrect magic number and typo in PROTOCOL; bz#1688 |
| 1614 | report and fix from ueno AT unixuser.org |
Darren Tucker | 75456e8 | 2010-01-08 18:55:58 +1100 | [diff] [blame] | 1615 | - stevesk@cvs.openbsd.org 2009/12/25 19:40:21 |
| 1616 | [readconf.c servconf.c misc.h ssh-keyscan.c misc.c] |
| 1617 | validate routing domain is in range 0-RT_TABLEID_MAX. |
| 1618 | 'Looks right' deraadt@ |
Darren Tucker | 535b5e1 | 2010-01-08 18:56:48 +1100 | [diff] [blame] | 1619 | - stevesk@cvs.openbsd.org 2009/12/29 16:38:41 |
| 1620 | [sshd_config.5 readconf.c ssh_config.5 scp.1 servconf.c sftp.1 ssh.1] |
| 1621 | Rename RDomain config option to RoutingDomain to be more clear and |
| 1622 | consistent with other options. |
| 1623 | NOTE: if you currently use RDomain in the ssh client or server config, |
| 1624 | or ssh/sshd -o, you must update to use RoutingDomain. |
| 1625 | ok markus@ djm@ |
Darren Tucker | 98e5d9a | 2010-01-08 18:57:39 +1100 | [diff] [blame] | 1626 | - jmc@cvs.openbsd.org 2009/12/29 18:03:32 |
| 1627 | [sshd_config.5 ssh_config.5] |
| 1628 | sort previous; |
Darren Tucker | 0c348f5 | 2010-01-08 18:58:05 +1100 | [diff] [blame] | 1629 | - dtucker@cvs.openbsd.org 2010/01/04 01:45:30 |
| 1630 | [sshconnect2.c] |
| 1631 | Don't escape backslashes in the SSH2 banner. bz#1533, patch from |
| 1632 | Michal Gorny via Gentoo. |
Darren Tucker | 909d858 | 2010-01-08 19:02:40 +1100 | [diff] [blame] | 1633 | - djm@cvs.openbsd.org 2010/01/04 02:03:57 |
| 1634 | [sftp.c] |
| 1635 | Implement tab-completion of commands, local and remote filenames for sftp. |
| 1636 | Hacked on and off for some time by myself, mouring, Carlos Silva (via 2009 |
| 1637 | Google Summer of Code) and polished to a fine sheen by myself again. |
| 1638 | It should deal more-or-less correctly with the ikky corner-cases presented |
| 1639 | by quoted filenames, but the UI could still be slightly improved. |
| 1640 | In particular, it is quite slow for remote completion on large directories. |
| 1641 | bz#200; ok markus@ |
Darren Tucker | aaf51d2 | 2010-01-08 19:04:49 +1100 | [diff] [blame] | 1642 | - djm@cvs.openbsd.org 2010/01/04 02:25:15 |
| 1643 | [sftp-server.c] |
| 1644 | bz#1566 don't unnecessarily dup() in and out fds for sftp-server; |
| 1645 | ok markus@ |
Darren Tucker | 340d168 | 2010-01-09 08:54:31 +1100 | [diff] [blame] | 1646 | - dtucker@cvs.openbsd.org 2010/01/08 21:50:49 |
| 1647 | [sftp.c] |
| 1648 | Fix two warnings: possibly used unitialized and use a nul byte instead of |
| 1649 | NULL pointer. ok djm@ |
Darren Tucker | 8cbd403 | 2010-01-08 19:13:25 +1100 | [diff] [blame] | 1650 | - (dtucker) [Makefile.in added roaming_client.c roaming_serv.c] Import new |
| 1651 | files for roaming and add to Makefile. |
Darren Tucker | dce7a92 | 2010-01-08 19:27:57 +1100 | [diff] [blame] | 1652 | - (dtucker) [Makefile.in] .c files do not belong in the OBJ lines. |
Darren Tucker | e67f7db | 2010-01-08 19:50:02 +1100 | [diff] [blame] | 1653 | - (dtucker) [sftp.c] ifdef out the sftp completion bits for platforms that |
| 1654 | don't have libedit. |
Darren Tucker | 1f5e3dc | 2010-01-08 19:53:52 +1100 | [diff] [blame] | 1655 | - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] Make |
| 1656 | RoutingDomain an unsupported option on platforms that don't have it. |
Darren Tucker | 843f0fa | 2010-01-08 19:56:33 +1100 | [diff] [blame] | 1657 | - (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote |
| 1658 | too. |
Darren Tucker | e83c3ea | 2010-01-08 20:03:56 +1100 | [diff] [blame] | 1659 | - (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to |
| 1660 | be created. |
Darren Tucker | cb5a1b6 | 2010-01-08 20:09:01 +1100 | [diff] [blame] | 1661 | - (dtucker] [misc.c] Shrink the area covered by USE_ROUTINGDOMAIN more |
| 1662 | to eliminate an unused variable warning. |
Darren Tucker | 1a8f535 | 2010-01-08 20:45:42 +1100 | [diff] [blame] | 1663 | - (dtucker) [roaming_serv.c] Include includes.h for u_intXX_t types. |
Darren Tucker | b7b17be | 2010-01-08 16:49:52 +1100 | [diff] [blame] | 1664 | |
Tim Rice | 880ab0d | 2009-12-26 15:40:47 -0800 | [diff] [blame] | 1665 | 20091226 |
| 1666 | - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 |
| 1667 | Gzip all man pages. Patch from Corinna Vinschen. |
| 1668 | |
Darren Tucker | 1bf3503 | 2009-12-21 10:49:21 +1100 | [diff] [blame] | 1669 | 20091221 |
| 1670 | - (dtucker) [auth-krb5.c platform.{c,h} openbsd-compat/port-aix.{c,h}] |
| 1671 | Bug #1583: Use system's kerberos principal name on AIX if it's available. |
| 1672 | Based on a patch from and tested by Miguel Sanders |
| 1673 | |
Darren Tucker | c8802aa | 2009-12-08 13:39:48 +1100 | [diff] [blame] | 1674 | 20091208 |
| 1675 | - (dtucker) Bug #1470: Disable OOM-killing of the listening sshd on Linux, |
| 1676 | based on a patch from Vaclav Ovsik and Colin Watson. ok djm. |
| 1677 | |
Darren Tucker | 1533311 | 2009-12-07 11:15:43 +1100 | [diff] [blame] | 1678 | 20091207 |
| 1679 | - (dtucker) Bug #1160: use pkg-config for opensc config if it's available. |
| 1680 | Tested by Martin Paljak. |
Darren Tucker | d35e0ef | 2009-12-07 11:32:36 +1100 | [diff] [blame] | 1681 | - (dtucker) Bug #1677: add conditionals around the source for ssh-askpass. |
Darren Tucker | 1533311 | 2009-12-07 11:15:43 +1100 | [diff] [blame] | 1682 | |
Tim Rice | 53e9974 | 2009-11-20 19:32:15 -0800 | [diff] [blame] | 1683 | 20091121 |
| 1684 | - (tim) [opensshd.init.in] If PidFile is set in sshd_config, use it. |
| 1685 | Bug 1628. OK dtucker@ |
| 1686 | |
Damien Miller | 409661f | 2009-11-20 15:16:35 +1100 | [diff] [blame] | 1687 | 20091120 |
| 1688 | - (djm) [ssh-rand-helper.c] Print error and usage() when passed command- |
| 1689 | line arguments as none are supported. Exit when passed unrecognised |
| 1690 | commandline flags. bz#1568 from gson AT araneus.fi |
| 1691 | |
| 1692 | 20091118 |
Damien Miller | 04ee0f8 | 2009-11-18 17:48:30 +1100 | [diff] [blame] | 1693 | - (djm) [channels.c misc.c misc.h sshd.c] add missing setsockopt() to |
| 1694 | set IPV6_V6ONLY for local forwarding with GatwayPorts=yes. Unify |
| 1695 | setting IPV6_V6ONLY behind a new function misc.c:sock_set_v6only() |
Damien Miller | 2191e04 | 2009-11-18 17:51:59 +1100 | [diff] [blame] | 1696 | bz#1648, report and fix from jan.kratochvil AT redhat.com |
| 1697 | - (djm) [contrib/gnome-ssh-askpass2.c] Make askpass dialog desktop-modal. |
| 1698 | bz#1645, patch from jchadima AT redhat.com |
Damien Miller | 04ee0f8 | 2009-11-18 17:48:30 +1100 | [diff] [blame] | 1699 | |
| 1700 | 20091107 |
Darren Tucker | df6578b | 2009-11-07 16:03:14 +1100 | [diff] [blame] | 1701 | - (dtucker) [authfile.c] Fall back to 3DES for the encryption of private |
| 1702 | keys when built with OpenSSL versions that don't do AES. |
| 1703 | |
Darren Tucker | e89ed1c | 2009-11-05 20:43:16 +1100 | [diff] [blame] | 1704 | 20091105 |
| 1705 | - (dtucker) [authfile.c] Add OpenSSL compat header so this still builds with |
| 1706 | older versions of OpenSSL. |
| 1707 | |
Darren Tucker | 1b11888 | 2009-10-24 11:40:32 +1100 | [diff] [blame] | 1708 | 20091024 |
| 1709 | - (dtucker) OpenBSD CVS Sync |
| 1710 | - djm@cvs.openbsd.org 2009/10/11 23:03:15 |
| 1711 | [hostfile.c] |
| 1712 | mention the host name that we are looking for in check_host_in_hostfile() |
Darren Tucker | 49b7e23 | 2009-10-24 11:41:05 +1100 | [diff] [blame] | 1713 | - sobrado@cvs.openbsd.org 2009/10/17 12:10:39 |
| 1714 | [sftp-server.c] |
| 1715 | sort flags. |
Darren Tucker | ae69e1d | 2009-10-24 11:41:34 +1100 | [diff] [blame] | 1716 | - sobrado@cvs.openbsd.org 2009/10/22 12:35:53 |
| 1717 | [ssh.1 ssh-agent.1 ssh-add.1] |
| 1718 | use the UNIX-related macros (.At and .Ux) where appropriate. |
| 1719 | ok jmc@ |
Darren Tucker | 98c9aec | 2009-10-24 11:42:44 +1100 | [diff] [blame] | 1720 | - sobrado@cvs.openbsd.org 2009/10/22 15:02:12 |
| 1721 | [ssh-agent.1 ssh-add.1 ssh.1] |
| 1722 | write UNIX-domain in a more consistent way; while here, replace a |
| 1723 | few remaining ".Tn UNIX" macros with ".Ux" ones. |
| 1724 | pointed out by ratchov@, thanks! |
| 1725 | ok jmc@ |
Darren Tucker | dfb9b71 | 2009-10-24 11:46:43 +1100 | [diff] [blame] | 1726 | - djm@cvs.openbsd.org 2009/10/22 22:26:13 |
| 1727 | [authfile.c] |
| 1728 | switch from 3DES to AES-128 for encryption of passphrase-protected |
| 1729 | SSH protocol 2 private keys; ok several |
Darren Tucker | 2f29a8c | 2009-10-24 11:47:58 +1100 | [diff] [blame] | 1730 | - djm@cvs.openbsd.org 2009/10/23 01:57:11 |
| 1731 | [sshconnect2.c] |
| 1732 | disallow a hostile server from checking jpake auth by sending an |
| 1733 | out-of-sequence success message. (doesn't affect code enabled by default) |
Darren Tucker | 199ee6f | 2009-10-24 11:50:17 +1100 | [diff] [blame] | 1734 | - dtucker@cvs.openbsd.org 2009/10/24 00:48:34 |
| 1735 | [ssh-keygen.1] |
| 1736 | ssh-keygen now uses AES-128 for private keys |
Darren Tucker | 6ac91a7 | 2009-10-24 11:52:42 +1100 | [diff] [blame] | 1737 | - (dtucker) [mdoc2man.awk] Teach it to understand the .Ux macro. |
Darren Tucker | 4d6656b | 2009-10-24 15:04:12 +1100 | [diff] [blame] | 1738 | - (dtucker) [session.c openbsd-compat/port-linux.{c,h}] Bug #1637: if selinux |
| 1739 | is enabled set the security context to "sftpd_t" before running the |
| 1740 | internal sftp server Based on a patch from jchadima at redhat. |
Darren Tucker | 1b11888 | 2009-10-24 11:40:32 +1100 | [diff] [blame] | 1741 | |
Darren Tucker | c182d99 | 2009-10-11 21:50:20 +1100 | [diff] [blame] | 1742 | 20091011 |
| 1743 | - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for |
| 1744 | dirent d_type and DTTOIF as we've switched OpenBSD to the more portable |
| 1745 | lstat. |
Darren Tucker | bad5076 | 2009-10-11 21:51:08 +1100 | [diff] [blame] | 1746 | - (dtucker) OpenBSD CVS Sync |
| 1747 | - markus@cvs.openbsd.org 2009/10/08 14:03:41 |
| 1748 | [sshd_config readconf.c ssh_config.5 servconf.c sshd_config.5] |
| 1749 | disable protocol 1 by default (after a transition period of about 10 years) |
| 1750 | ok deraadt |
Darren Tucker | 7a4a765 | 2009-10-11 21:51:40 +1100 | [diff] [blame] | 1751 | - jmc@cvs.openbsd.org 2009/10/08 20:42:12 |
| 1752 | [sshd_config.5 ssh_config.5 sshd.8 ssh.1] |
| 1753 | some tweaks now that protocol 1 is not offered by default; ok markus |
Darren Tucker | 438b473 | 2009-10-11 21:52:10 +1100 | [diff] [blame] | 1754 | - dtucker@cvs.openbsd.org 2009/10/11 10:41:26 |
| 1755 | [sftp-client.c] |
| 1756 | d_type isn't portable so use lstat to get dirent modes. Suggested by and |
| 1757 | "looks sane" deraadt@ |
Darren Tucker | e23a79c | 2009-10-12 09:37:22 +1100 | [diff] [blame] | 1758 | - markus@cvs.openbsd.org 2009/10/08 18:04:27 |
| 1759 | [regress/test-exec.sh] |
| 1760 | re-enable protocol v1 for the tests. |
Darren Tucker | c182d99 | 2009-10-11 21:50:20 +1100 | [diff] [blame] | 1761 | |
Darren Tucker | 46bbbe3 | 2009-10-07 08:21:48 +1100 | [diff] [blame] | 1762 | 20091007 |
| 1763 | - (dtucker) OpenBSD CVS Sync |
| 1764 | - djm@cvs.openbsd.org 2009/08/12 00:13:00 |
| 1765 | [sftp.c sftp.1] |
| 1766 | support most of scp(1)'s commandline arguments in sftp(1), as a first |
| 1767 | step towards making sftp(1) a drop-in replacement for scp(1). |
| 1768 | One conflicting option (-P) has not been changed, pending further |
| 1769 | discussion. |
| 1770 | Patch from carlosvsilvapt@gmail.com as part of his work in the |
| 1771 | Google Summer of Code |
Darren Tucker | adba1ba | 2009-10-07 08:22:20 +1100 | [diff] [blame] | 1772 | - jmc@cvs.openbsd.org 2009/08/12 06:31:42 |
| 1773 | [sftp.1] |
| 1774 | sort options; |
Darren Tucker | 282b402 | 2009-10-07 08:23:06 +1100 | [diff] [blame] | 1775 | - djm@cvs.openbsd.org 2009/08/13 01:11:19 |
| 1776 | [sftp.1 sftp.c] |
| 1777 | Swizzle options: "-P sftp_server_path" moves to "-D sftp_server_path", |
| 1778 | add "-P port" to match scp(1). Fortunately, the -P option is only really |
| 1779 | used by our regression scripts. |
| 1780 | part of larger patch from carlosvsilvapt@gmail.com for his Google Summer |
| 1781 | of Code work; ok deraadt markus |
Darren Tucker | c07138e | 2009-10-07 08:23:44 +1100 | [diff] [blame] | 1782 | - jmc@cvs.openbsd.org 2009/08/13 13:39:54 |
| 1783 | [sftp.1 sftp.c] |
| 1784 | sync synopsis and usage(); |
Darren Tucker | c22f090 | 2009-10-07 08:24:19 +1100 | [diff] [blame] | 1785 | - djm@cvs.openbsd.org 2009/08/14 18:17:49 |
| 1786 | [sftp-client.c] |
| 1787 | make the "get_handle: ..." error messages vaguely useful by allowing |
| 1788 | callers to specify their own error message strings. |
Darren Tucker | e54a036 | 2009-10-07 08:35:32 +1100 | [diff] [blame] | 1789 | - fgsch@cvs.openbsd.org 2009/08/15 18:56:34 |
| 1790 | [auth.h] |
| 1791 | remove unused define. markus@ ok. |
| 1792 | (Id sync only, Portable still uses this.) |
Darren Tucker | 1477ea1 | 2009-10-07 08:36:05 +1100 | [diff] [blame] | 1793 | - dtucker@cvs.openbsd.org 2009/08/16 23:29:26 |
| 1794 | [sshd_config.5] |
| 1795 | Add PubkeyAuthentication to the list allowed in a Match block (bz #1577) |
Darren Tucker | 1b0dd17 | 2009-10-07 08:37:48 +1100 | [diff] [blame] | 1796 | - djm@cvs.openbsd.org 2009/08/18 18:36:21 |
| 1797 | [sftp-client.h sftp.1 sftp-client.c sftp.c] |
| 1798 | recursive transfer support for get/put and on the commandline |
| 1799 | work mostly by carlosvsilvapt@gmail.com for the Google Summer of Code |
| 1800 | with some tweaks by me; "go for it" deraadt@ |
Darren Tucker | 05016b2 | 2009-10-07 08:38:23 +1100 | [diff] [blame] | 1801 | - djm@cvs.openbsd.org 2009/08/18 21:15:59 |
| 1802 | [sftp.1] |
| 1803 | fix "get" command usage, spotted by jmc@ |
Darren Tucker | b3b40a8 | 2009-10-07 08:39:09 +1100 | [diff] [blame] | 1804 | - jmc@cvs.openbsd.org 2009/08/19 04:56:03 |
| 1805 | [sftp.1] |
| 1806 | ether -> either; |
Darren Tucker | 8ec4fd8 | 2009-10-07 08:39:57 +1100 | [diff] [blame] | 1807 | - dtucker@cvs.openbsd.org 2009/08/20 23:54:28 |
| 1808 | [mux.c] |
| 1809 | subsystem_flag is defined in ssh.c so it's extern; ok djm |
Darren Tucker | 7dc4850 | 2009-10-07 08:44:42 +1100 | [diff] [blame] | 1810 | - djm@cvs.openbsd.org 2009/08/27 17:28:52 |
| 1811 | [sftp-server.c] |
| 1812 | allow setting an explicit umask on the commandline to override whatever |
| 1813 | default the user has. bz#1229; ok dtucker@ deraadt@ markus@ |
Darren Tucker | 9bcd25b | 2009-10-07 08:45:48 +1100 | [diff] [blame] | 1814 | - djm@cvs.openbsd.org 2009/08/27 17:33:49 |
| 1815 | [ssh-keygen.c] |
| 1816 | force use of correct hash function for random-art signature display |
| 1817 | as it was inheriting the wrong one when bubblebabble signatures were |
| 1818 | activated; bz#1611 report and patch from fwojcik+openssh AT besh.com; |
| 1819 | ok markus@ |
Darren Tucker | 6b286a4 | 2009-10-07 08:46:21 +1100 | [diff] [blame] | 1820 | - djm@cvs.openbsd.org 2009/08/27 17:43:00 |
| 1821 | [sftp-server.8] |
| 1822 | allow setting an explicit umask on the commandline to override whatever |
| 1823 | default the user has. bz#1229; ok dtucker@ deraadt@ markus@ |
Darren Tucker | 893d735 | 2009-10-07 08:47:02 +1100 | [diff] [blame] | 1824 | - djm@cvs.openbsd.org 2009/08/27 17:44:52 |
| 1825 | [authfd.c ssh-add.c authfd.h] |
| 1826 | Do not fall back to adding keys without contraints (ssh-add -c / -t ...) |
| 1827 | when the agent refuses the constrained add request. This was a useful |
| 1828 | migration measure back in 2002 when constraints were new, but just |
| 1829 | adds risk now. |
| 1830 | bz #1612, report and patch from dkg AT fifthhorseman.net; ok markus@ |
Darren Tucker | 30359e1 | 2009-10-07 08:47:24 +1100 | [diff] [blame] | 1831 | - djm@cvs.openbsd.org 2009/08/31 20:56:02 |
| 1832 | [sftp-server.c] |
| 1833 | check correct variable for error message, spotted by martynas@ |
Darren Tucker | 7bee06a | 2009-10-07 08:47:47 +1100 | [diff] [blame] | 1834 | - djm@cvs.openbsd.org 2009/08/31 21:01:29 |
| 1835 | [sftp-server.8] |
| 1836 | document -e and -h; prodded by jmc@ |
Darren Tucker | 72473c6 | 2009-10-07 09:01:03 +1100 | [diff] [blame] | 1837 | - djm@cvs.openbsd.org 2009/09/01 14:43:17 |
| 1838 | [ssh-agent.c] |
| 1839 | fix a race condition in ssh-agent that could result in a wedged or |
| 1840 | spinning agent: don't read off the end of the allocated fd_sets, and |
| 1841 | don't issue blocking read/write on agent sockets - just fall back to |
| 1842 | select() on retriable read/write errors. bz#1633 reported and tested |
| 1843 | by "noodle10000 AT googlemail.com"; ok dtucker@ markus@ |
Darren Tucker | 759cb2a | 2009-10-07 09:01:50 +1100 | [diff] [blame] | 1844 | - grunk@cvs.openbsd.org 2009/10/01 11:37:33 |
| 1845 | [dh.c] |
| 1846 | fix a cast |
| 1847 | ok djm@ markus@ |
Darren Tucker | 695ed39 | 2009-10-07 09:02:18 +1100 | [diff] [blame] | 1848 | - djm@cvs.openbsd.org 2009/10/06 04:46:40 |
| 1849 | [session.c] |
| 1850 | bz#1596: fflush(NULL) before exec() to ensure that everying (motd |
| 1851 | in particular) has made it out before the streams go away. |
Darren Tucker | 7023d16 | 2009-10-07 10:30:06 +1100 | [diff] [blame] | 1852 | - djm@cvs.openbsd.org 2008/12/07 22:17:48 |
| 1853 | [regress/addrmatch.sh] |
| 1854 | match string "passwordauthentication" only at start of line, not anywhere |
| 1855 | in sshd -T output |
Darren Tucker | 7988553 | 2009-10-07 10:30:57 +1100 | [diff] [blame] | 1856 | - dtucker@cvs.openbsd.org 2009/05/05 07:51:36 |
| 1857 | [regress/multiplex.sh] |
| 1858 | Always specify ssh_config for multiplex tests: prevents breakage caused |
| 1859 | by options in ~/.ssh/config. From Dan Peterson. |
Darren Tucker | 287b932 | 2009-10-07 10:31:56 +1100 | [diff] [blame] | 1860 | - djm@cvs.openbsd.org 2009/08/13 00:57:17 |
| 1861 | [regress/Makefile] |
| 1862 | regression test for port number parsing. written as part of the a2port |
| 1863 | change that went into 5.2 but I forgot to commit it at the time... |
Darren Tucker | ed6b0c5 | 2009-10-07 10:43:57 +1100 | [diff] [blame] | 1864 | - djm@cvs.openbsd.org 2009/08/13 01:11:55 |
Darren Tucker | b707a24 | 2009-10-07 10:54:31 +1100 | [diff] [blame] | 1865 | [regress/sftp-batch.sh regress/sftp-badcmds.sh regress/sftp.sh |
| 1866 | regress/sftp-cmds.sh regres/sftp-glob.sh] |
Darren Tucker | ed6b0c5 | 2009-10-07 10:43:57 +1100 | [diff] [blame] | 1867 | date: 2009/08/13 01:11:19; author: djm; state: Exp; lines: +10 -7 |
| 1868 | Swizzle options: "-P sftp_server_path" moves to "-D sftp_server_path", |
| 1869 | add "-P port" to match scp(1). Fortunately, the -P option is only really |
| 1870 | used by our regression scripts. |
| 1871 | part of larger patch from carlosvsilvapt@gmail.com for his Google Summer |
| 1872 | of Code work; ok deraadt markus |
Darren Tucker | c863895 | 2009-10-07 10:46:29 +1100 | [diff] [blame] | 1873 | - djm@cvs.openbsd.org 2009/08/20 18:43:07 |
Darren Tucker | b707a24 | 2009-10-07 10:54:31 +1100 | [diff] [blame] | 1874 | [regress/ssh-com-sftp.sh] |
Darren Tucker | c863895 | 2009-10-07 10:46:29 +1100 | [diff] [blame] | 1875 | fix one sftp -D ... => sftp -P ... conversion that I missed; from Carlos |
| 1876 | Silva for Google Summer of Code |
Darren Tucker | b707a24 | 2009-10-07 10:54:31 +1100 | [diff] [blame] | 1877 | - dtucker@cvs.openbsd.org 2009/10/06 23:51:49 |
| 1878 | [regress/ssh2putty.sh] |
| 1879 | Add OpenBSD tag to make syncs easier |
Darren Tucker | a25ab01 | 2009-10-07 11:00:58 +1100 | [diff] [blame] | 1880 | - (dtucker) [regress/portnum.sh] Import new test. |
Darren Tucker | 538738d | 2009-10-07 18:56:10 +1100 | [diff] [blame] | 1881 | - (dtucker) [configure.ac sftp-client.c] DTOTIF is in fs/ffs/dir.h on at |
Darren Tucker | 4adeac7 | 2009-10-07 15:49:48 +1100 | [diff] [blame] | 1882 | least dragonflybsd. |
Darren Tucker | 538738d | 2009-10-07 18:56:10 +1100 | [diff] [blame] | 1883 | - (dtucker) d_type is not mandated by POSIX, so add fallback code using |
| 1884 | stat(), needed on at least cygwin. |
Darren Tucker | 46bbbe3 | 2009-10-07 08:21:48 +1100 | [diff] [blame] | 1885 | |
Damien Miller | 350666d | 2009-10-02 11:50:55 +1000 | [diff] [blame] | 1886 | 20091002 |
| 1887 | - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. |
| 1888 | spotted by des AT des.no |
| 1889 | |
Damien Miller | ea43742 | 2009-10-02 11:49:03 +1000 | [diff] [blame] | 1890 | 20090926 |
| 1891 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
| 1892 | [contrib/suse/openssh.spec] Update for release |
| 1893 | - (djm) [README] update relnotes URL |
| 1894 | - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere |
| 1895 | - (djm) Release 5.3p1 |
| 1896 | |
Darren Tucker | e02b49a | 2009-09-11 14:56:08 +1000 | [diff] [blame] | 1897 | 20090911 |
| 1898 | - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X |
| 1899 | 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch |
| 1900 | from jbasney at ncsa uiuc edu. |
| 1901 | |
Damien Miller | e5d5a17 | 2009-09-09 11:07:28 +1000 | [diff] [blame] | 1902 | 20090908 |
| 1903 | - (djm) [serverloop.c] Fix test for server-assigned remote forwarding port |
| 1904 | (-R 0:...); bz#1578, spotted and fix by gavin AT emf.net; ok dtucker@ |
| 1905 | |
Darren Tucker | dad48e7 | 2009-09-01 18:26:00 +1000 | [diff] [blame] | 1906 | 20090901 |
| 1907 | - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for |
| 1908 | krb5-config if it's not in the location specified by --with-kerberos5. |
| 1909 | Patch from jchadima at redhat. |
| 1910 | |
Darren Tucker | 427adf1 | 2009-08-29 09:14:48 +1000 | [diff] [blame] | 1911 | 20090829 |
| 1912 | - (dtucker) [README.platform] Add text about development packages, based on |
| 1913 | text from Chris Pepper in bug #1631. |
| 1914 | |
Darren Tucker | 28b973e | 2009-08-28 10:16:44 +1000 | [diff] [blame] | 1915 | 20090828 |
| 1916 | - dtucker [auth-sia.c] Roll back the change for bug #1241 as it apparently |
| 1917 | causes problems in some Tru64 configurations. |
Damien Miller | 8aac993 | 2009-08-28 10:40:30 +1000 | [diff] [blame] | 1918 | - (djm) [sshd_config.5] downgrade mention of login.conf to be an example |
| 1919 | and mention PAM as another provider for ChallengeResponseAuthentication; |
| 1920 | bz#1408; ok dtucker@ |
Damien Miller | 0e26551 | 2009-08-28 10:43:13 +1000 | [diff] [blame] | 1921 | - (djm) [sftp-server.c] bz#1535: accept ENOSYS as a fallback error when |
| 1922 | attempting atomic rename(); ok dtucker@ |
Damien Miller | 7d4a268 | 2009-08-28 10:47:38 +1000 | [diff] [blame] | 1923 | - (djm) [Makefile.in] bz#1505: Solaris make(1) doesn't accept make variables |
| 1924 | in argv, so pass them in the environment; ok dtucker@ |
Darren Tucker | 3980b63 | 2009-08-28 11:02:37 +1000 | [diff] [blame] | 1925 | - (dtucker) [channels.c configure.ac] Bug #1528: skip the tcgetattr call on |
| 1926 | the pty master on Solaris, since it never succeeds and can hang if large |
| 1927 | amounts of data is sent to the slave (eg a copy-paste). Based on a patch |
| 1928 | originally from Doke Scott, ok djm@ |
Darren Tucker | 86e30a0 | 2009-08-28 11:21:06 +1000 | [diff] [blame] | 1929 | - (dtucker) [clientloop.c configure.ac defines.h] Make the client's IO buffer |
| 1930 | size a compile-time option and set it to 64k on Cygwin, since Corinna |
| 1931 | reports that it makes a significant difference to performance. ok djm@ |
Darren Tucker | ac9f1b9 | 2009-08-28 15:01:20 +1000 | [diff] [blame] | 1932 | - (dtucker) [configure.ac] Fix the syntax of the Solaris tcgetattr entry. |
Darren Tucker | 28b973e | 2009-08-28 10:16:44 +1000 | [diff] [blame] | 1933 | |
Darren Tucker | 2a5588d | 2009-08-20 16:16:01 +1000 | [diff] [blame] | 1934 | 20090820 |
| 1935 | - (dtucker) [includes.h] Bug #1634: do not include system glob.h if we're not |
| 1936 | using it since the type conflicts can cause problems on FreeBSD. Patch |
| 1937 | from Jonathan Chen. |
Darren Tucker | 82edf23 | 2009-08-20 16:20:50 +1000 | [diff] [blame] | 1938 | - (dtucker) [session.c openbsd-compat/port-aix.h] Bugs #1249 and #1567: move |
| 1939 | the setpcred call on AIX to immediately before the permanently_set_uid(). |
| 1940 | Ensures that we still have privileges when we call chroot and |
| 1941 | pam_open_sesson. Based on a patch from David Leonard. |
Darren Tucker | 2a5588d | 2009-08-20 16:16:01 +1000 | [diff] [blame] | 1942 | |
Darren Tucker | 83d8f28 | 2009-08-17 09:35:22 +1000 | [diff] [blame] | 1943 | 20090817 |
| 1944 | - (dtucker) [configure.ac] Check for headers before libraries for openssl an |
| 1945 | zlib, which should make the errors slightly more meaningful on platforms |
| 1946 | where there's separate "-devel" packages for those. |
Darren Tucker | b5d5ee1 | 2009-08-17 09:40:00 +1000 | [diff] [blame] | 1947 | - (dtucker) [sshlogin.c openbsd-compat/port-aix.{c,h}] Bug #1595: make |
| 1948 | PrintLastLog work on AIX. Based in part on a patch from Miguel Sanders. |
Darren Tucker | 83d8f28 | 2009-08-17 09:35:22 +1000 | [diff] [blame] | 1949 | |
Tim Rice | caeb164 | 2009-07-29 07:21:13 -0700 | [diff] [blame] | 1950 | 20090729 |
| 1951 | - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error |
| 1952 | function. Patch from Corinna Vinschen. |
| 1953 | |
Darren Tucker | 440089a | 2009-07-13 11:38:23 +1000 | [diff] [blame] | 1954 | 20090713 |
| 1955 | - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it |
| 1956 | fits into 16 bits to work around a bug in glibc's resolver where it masks |
| 1957 | off the buffer size at 16 bits. Patch from Hauke Lampe, ok djm jakob. |
| 1958 | |
Darren Tucker | c4b22ca | 2009-07-12 21:56:29 +1000 | [diff] [blame] | 1959 | 20090712 |
| 1960 | - (dtucker) [configure.ac] Include sys/param.h for the sys/mount.h test, |
| 1961 | prevents configure complaining on older BSDs. |
Darren Tucker | 8fdcba5 | 2009-07-12 21:58:42 +1000 | [diff] [blame] | 1962 | - (dtucker [contrib/cygwin/ssh-{host,user}-config] Add license text. Patch |
| 1963 | from Corinna Vinschen. |
Darren Tucker | 622d5c5 | 2009-07-12 22:07:21 +1000 | [diff] [blame] | 1964 | - (dtucker) [auth-pam.c] Bug #1534: move the deletion of PAM credentials on |
Darren Tucker | 916fdda | 2009-07-12 22:12:28 +1000 | [diff] [blame] | 1965 | logout to after the session close. Patch from Anicka Bernathova, |
| 1966 | originally from Andreas Schwab via Novelll ok djm. |
Darren Tucker | c4b22ca | 2009-07-12 21:56:29 +1000 | [diff] [blame] | 1967 | |
Darren Tucker | 4d4fdc0 | 2009-07-07 21:19:11 +1000 | [diff] [blame] | 1968 | 20090707 |
| 1969 | - (dtucker) [contrib/cygwin/ssh-host-config] better support for automated |
| 1970 | scripts and fix usage of eval. Patch from Corinna Vinschen. |
| 1971 | |
| 1972 | 20090705 |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 1973 | - (dtucker) OpenBSD CVS Sync |
| 1974 | - andreas@cvs.openbsd.org 2009/06/27 09:29:06 |
| 1975 | [packet.h packet.c] |
| 1976 | packet_bacup_state() and packet_restore_state() will be used to |
| 1977 | temporarily save the current state ren resuming a suspended connection. |
| 1978 | ok markus@ |
Darren Tucker | 466df21 | 2009-07-06 07:11:52 +1000 | [diff] [blame] | 1979 | - andreas@cvs.openbsd.org 2009/06/27 09:32:43 |
| 1980 | [roaming_common.c roaming.h] |
| 1981 | It may be necessary to retransmit some data when resuming, so add it |
| 1982 | to a buffer when roaming is enabled. |
| 1983 | Most of this code was written by Martin Forssen, maf at appgate dot com. |
| 1984 | ok markus@ |
Darren Tucker | 71e4d54 | 2009-07-06 07:12:27 +1000 | [diff] [blame] | 1985 | - andreas@cvs.openbsd.org 2009/06/27 09:35:06 |
| 1986 | [readconf.h readconf.c] |
| 1987 | Add client option UseRoaming. It doesn't do anything yet but will |
| 1988 | control whether the client tries to use roaming if enabled on the |
| 1989 | server. From Martin Forssen. |
| 1990 | ok markus@ |
Darren Tucker | cd6b1a2 | 2009-07-06 07:13:04 +1000 | [diff] [blame] | 1991 | - markus@cvs.openbsd.org 2009/06/30 14:54:40 |
| 1992 | [version.h] |
| 1993 | crank version; ok deraadt |
Darren Tucker | 199b134 | 2009-07-06 07:16:56 +1000 | [diff] [blame] | 1994 | - dtucker@cvs.openbsd.org 2009/07/02 02:11:47 |
| 1995 | [ssh.c] |
| 1996 | allow for long home dir paths (bz #1615). ok deraadt |
| 1997 | (based in part on a patch from jchadima at redhat) |
Darren Tucker | de0c025 | 2009-07-06 07:17:35 +1000 | [diff] [blame] | 1998 | - stevesk@cvs.openbsd.org 2009/07/05 19:28:33 |
| 1999 | [clientloop.c] |
| 2000 | only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@ |
| 2001 | ok deraadt@ markus@ |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2002 | |
Darren Tucker | 821d3db | 2009-06-22 16:11:06 +1000 | [diff] [blame] | 2003 | 20090622 |
| 2004 | - (dtucker) OpenBSD CVS Sync |
| 2005 | - dtucker@cvs.openbsd.org 2009/06/22 05:39:28 |
| 2006 | [monitor_wrap.c monitor_mm.c ssh-keygen.c auth2.c gss-genr.c sftp-client.c] |
| 2007 | alphabetize includes; reduces diff vs portable and style(9). |
| 2008 | ok stevesk djm |
| 2009 | (Id sync only; these were already in order in -portable) |
| 2010 | |
Darren Tucker | 72efd74 | 2009-06-21 17:48:00 +1000 | [diff] [blame] | 2011 | 20090621 |
| 2012 | - (dtucker) OpenBSD CVS Sync |
| 2013 | - markus@cvs.openbsd.org 2009/03/17 21:37:00 |
| 2014 | [ssh.c] |
| 2015 | pass correct argv[0] to openlog(); ok djm@ |
Darren Tucker | 3a6a51f | 2009-06-21 17:48:52 +1000 | [diff] [blame] | 2016 | - jmc@cvs.openbsd.org 2009/03/19 15:15:09 |
| 2017 | [ssh.1] |
| 2018 | for "Ciphers", just point the reader to the keyword in ssh_config(5), just |
| 2019 | as we do for "MACs": this stops us getting out of sync when the lists |
| 2020 | change; |
| 2021 | fixes documentation/6102, submitted by Peter J. Philipp |
| 2022 | alternative fix proposed by djm |
| 2023 | ok markus |
Darren Tucker | a096450 | 2009-06-21 17:49:36 +1000 | [diff] [blame] | 2024 | - tobias@cvs.openbsd.org 2009/03/23 08:31:19 |
| 2025 | [ssh-agent.c] |
| 2026 | Fixed a possible out-of-bounds memory access if the environment variable |
| 2027 | SHELL is shorter than 3 characters. |
| 2028 | with input by and ok dtucker |
Darren Tucker | 9013323 | 2009-06-21 17:50:15 +1000 | [diff] [blame] | 2029 | - tobias@cvs.openbsd.org 2009/03/23 19:38:04 |
| 2030 | [ssh-agent.c] |
| 2031 | My previous commit didn't fix the problem at all, so stick at my first |
| 2032 | version of the fix presented to dtucker. |
| 2033 | Issue notified by Matthias Barkhoff (matthias dot barkhoff at gmx dot de). |
| 2034 | ok dtucker |
Darren Tucker | 5837b51 | 2009-06-21 17:52:27 +1000 | [diff] [blame] | 2035 | - sobrado@cvs.openbsd.org 2009/03/26 08:38:39 |
| 2036 | [sftp-server.8 sshd.8 ssh-agent.1] |
| 2037 | fix a few typographical errors found by spell(1). |
| 2038 | ok dtucker@, jmc@ |
Darren Tucker | af501cf | 2009-06-21 17:53:04 +1000 | [diff] [blame] | 2039 | - stevesk@cvs.openbsd.org 2009/04/13 19:07:44 |
| 2040 | [sshd_config.5] |
| 2041 | fix possessive; ok djm@ |
Darren Tucker | b62f1a8 | 2009-06-21 17:53:48 +1000 | [diff] [blame] | 2042 | - stevesk@cvs.openbsd.org 2009/04/14 16:33:42 |
| 2043 | [sftp-server.c] |
| 2044 | remove unused option character from getopt() optstring; ok markus@ |
Darren Tucker | 3b59dfa | 2009-06-21 17:54:47 +1000 | [diff] [blame] | 2045 | - jj@cvs.openbsd.org 2009/04/14 21:10:54 |
| 2046 | [servconf.c] |
| 2047 | Fixed a few the-the misspellings in comments. Skipped a bunch in |
| 2048 | binutils,gcc and so on. ok jmc@ |
Darren Tucker | ac46a91 | 2009-06-21 17:55:23 +1000 | [diff] [blame] | 2049 | - stevesk@cvs.openbsd.org 2009/04/17 19:23:06 |
| 2050 | [session.c] |
| 2051 | use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server; |
| 2052 | ok djm@ markus@ |
Darren Tucker | 00fcd71 | 2009-06-21 17:56:00 +1000 | [diff] [blame] | 2053 | - stevesk@cvs.openbsd.org 2009/04/17 19:40:17 |
| 2054 | [sshd_config.5] |
| 2055 | clarify that even internal-sftp needs /dev/log for logging to work; ok |
| 2056 | markus@ |
Darren Tucker | f92077f | 2009-06-21 17:56:25 +1000 | [diff] [blame] | 2057 | - jmc@cvs.openbsd.org 2009/04/18 18:39:10 |
| 2058 | [sshd_config.5] |
| 2059 | tweak previous; ok stevesk |
Darren Tucker | 51dbe50 | 2009-06-21 17:56:51 +1000 | [diff] [blame] | 2060 | - stevesk@cvs.openbsd.org 2009/04/21 15:13:17 |
| 2061 | [sshd_config.5] |
| 2062 | clarify we cd to user's home after chroot; ok markus@ on |
| 2063 | earlier version; tweaks and ok jmc@ |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2064 | - andreas@cvs.openbsd.org 2009/05/25 06:48:01 |
| 2065 | [channels.c packet.c clientloop.c packet.h serverloop.c monitor_wrap.c |
| 2066 | monitor.c] |
| 2067 | Put the globals in packet.c into a struct and don't access it directly |
| 2068 | from other files. No functional changes. |
| 2069 | ok markus@ djm@ |
| 2070 | - andreas@cvs.openbsd.org 2009/05/27 06:31:25 |
| 2071 | [canohost.h canohost.c] |
| 2072 | Add clear_cached_addr(), needed for upcoming changes allowing the peer |
| 2073 | address to change. |
| 2074 | ok markus@ |
Darren Tucker | 39c7632 | 2009-06-21 18:13:57 +1000 | [diff] [blame] | 2075 | - andreas@cvs.openbsd.org 2009/05/27 06:33:39 |
| 2076 | [clientloop.c] |
| 2077 | Send SSH2_MSG_DISCONNECT when the client disconnects. From a larger |
| 2078 | change from Martin Forssen, maf at appgate dot com. |
| 2079 | ok markus@ |
Darren Tucker | 12b4a65 | 2009-06-21 18:14:48 +1000 | [diff] [blame] | 2080 | - andreas@cvs.openbsd.org 2009/05/27 06:34:36 |
| 2081 | [kex.c kex.h] |
| 2082 | Move the KEX_COOKIE_LEN define to kex.h |
| 2083 | ok markus@ |
Darren Tucker | 5b48cdd | 2009-06-21 18:15:25 +1000 | [diff] [blame] | 2084 | - andreas@cvs.openbsd.org 2009/05/27 06:36:07 |
| 2085 | [packet.h packet.c] |
| 2086 | Add packet_put_int64() and packet_get_int64(), part of a larger change |
| 2087 | from Martin Forssen. |
Darren Tucker | 761c389 | 2009-06-21 18:16:26 +1000 | [diff] [blame] | 2088 | ok markus@ |
| 2089 | - andreas@cvs.openbsd.org 2009/05/27 06:38:16 |
| 2090 | [sshconnect.h sshconnect.c] |
| 2091 | Un-static ssh_exchange_identification(), part of a larger change from |
| 2092 | Martin Forssen and needed for upcoming changes. |
| 2093 | ok markus@ |
Darren Tucker | 1cc55d7 | 2009-06-21 18:17:19 +1000 | [diff] [blame] | 2094 | - andreas@cvs.openbsd.org 2009/05/28 16:50:16 |
| 2095 | [sshd.c packet.c serverloop.c monitor_wrap.c clientloop.c sshconnect.c |
Darren Tucker | c5564e1 | 2009-06-21 18:53:53 +1000 | [diff] [blame] | 2096 | monitor.c Added roaming.h roaming_common.c roaming_dummy.c] |
Darren Tucker | 1cc55d7 | 2009-06-21 18:17:19 +1000 | [diff] [blame] | 2097 | Keep track of number of bytes read and written. Needed for upcoming |
| 2098 | changes. Most code from Martin Forssen, maf at appgate dot com. |
| 2099 | ok markus@ |
Darren Tucker | c5564e1 | 2009-06-21 18:53:53 +1000 | [diff] [blame] | 2100 | Also, applied appropriate changes to Makefile.in |
Darren Tucker | b422afa | 2009-06-21 18:58:46 +1000 | [diff] [blame] | 2101 | - andreas@cvs.openbsd.org 2009/06/12 20:43:22 |
| 2102 | [monitor.c packet.c] |
| 2103 | Fix warnings found by chl@ and djm@ and change roaming_atomicio's |
| 2104 | return type to match atomicio's |
| 2105 | Diff from djm@, ok markus@ |
Darren Tucker | 7b935c7 | 2009-06-21 18:59:36 +1000 | [diff] [blame] | 2106 | - andreas@cvs.openbsd.org 2009/06/12 20:58:32 |
| 2107 | [packet.c] |
| 2108 | Move some more statics into session_state |
| 2109 | ok markus@ djm@ |
Darren Tucker | 6ae35ac | 2009-06-21 19:00:20 +1000 | [diff] [blame] | 2110 | - dtucker@cvs.openbsd.org 2009/06/21 07:37:15 |
| 2111 | [kexdhs.c kexgexs.c] |
| 2112 | abort if key_sign fails, preventing possible null deref. Based on report |
| 2113 | from Paolo Ganci, ok markus@ djm@ |
Darren Tucker | e6b590e | 2009-06-21 19:08:48 +1000 | [diff] [blame] | 2114 | - dtucker@cvs.openbsd.org 2009/06/21 09:04:03 |
| 2115 | [roaming.h roaming_common.c roaming_dummy.c] |
| 2116 | Add tags for the benefit of the sync scripts |
| 2117 | Also: pull in the changes for 1.1->1.2 missed in the previous sync. |
Darren Tucker | 43e7a35 | 2009-06-21 19:50:08 +1000 | [diff] [blame] | 2118 | - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and |
| 2119 | header-order changes to reduce diff vs OpenBSD. |
Darren Tucker | 64cee36 | 2009-06-21 20:26:17 +1000 | [diff] [blame] | 2120 | - (dtucker) [servconf.c sshd.c] More whitespace sync. |
Darren Tucker | 828c96d | 2009-06-21 22:22:08 +1000 | [diff] [blame] | 2121 | - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include <inttypes.h> in |
| 2122 | ifdef. |
Darren Tucker | 72efd74 | 2009-06-21 17:48:00 +1000 | [diff] [blame] | 2123 | |
Darren Tucker | 3278062 | 2009-06-16 16:11:02 +1000 | [diff] [blame] | 2124 | 20090616 |
| 2125 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t |
| 2126 | is a struct with a __val member. Fixes build on, eg, Redhat 6.2. |
| 2127 | |
Darren Tucker | a422d97 | 2009-05-04 12:52:47 +1000 | [diff] [blame] | 2128 | 20090504 |
| 2129 | - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include |
| 2130 | variable declarations. Should prevent unused warnings anywhere it's set |
| 2131 | (only Crays as far as I can tell) and be a no-op everywhere else. |
| 2132 | |
Tim Rice | a74000e | 2009-03-18 11:25:02 -0700 | [diff] [blame] | 2133 | 20090318 |
| 2134 | - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem |
| 2135 | that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005. |
| 2136 | Based on patch from vinschen at redhat com. |
| 2137 | |
Darren Tucker | 9d86e5d | 2009-03-08 11:40:27 +1100 | [diff] [blame] | 2138 | 20090308 |
| 2139 | - (dtucker) [auth-passwd.c auth1.c auth2-kbdint.c auth2-none.c auth2-passwd.c |
| 2140 | auth2-pubkey.c session.c openbsd-compat/bsd-cygwin_util.{c,h} |
| 2141 | openbsd-compat/daemon.c] Remove support for Windows 95/98/ME and very old |
| 2142 | version of Cygwin. Patch from vinschen at redhat com. |
| 2143 | |
Darren Tucker | 558d6ca | 2009-03-07 10:22:10 +1100 | [diff] [blame] | 2144 | 20090307 |
| 2145 | - (dtucker) [contrib/aix/buildbff.sh] Only try to rename ssh_prng_cmds if it |
| 2146 | exists (it's not created if OpenSSL's PRNG is self-seeded, eg if the OS |
| 2147 | has a /dev/random). |
Darren Tucker | 8aae6ff | 2009-03-07 12:01:47 +1100 | [diff] [blame] | 2148 | - (dtucker) [schnorr.c openbsd-compat/openssl-compat.{c,h}] Add |
| 2149 | EVP_DigestUpdate to the OLD_EVP compatibility functions and tell schnorr.c |
| 2150 | to use them. Allows building with older OpenSSL versions. |
Darren Tucker | ccfee05 | 2009-03-07 12:32:22 +1100 | [diff] [blame] | 2151 | - (dtucker) [configure.ac defines.h] Check for in_port_t and typedef if needed. |
Darren Tucker | 30ed668 | 2009-03-07 18:06:22 +1100 | [diff] [blame] | 2152 | - (dtucker) [configure.ac] Missing comma in type list. |
Darren Tucker | 3e7e15f | 2009-03-07 22:22:35 +1100 | [diff] [blame] | 2153 | - (dtucker) [configure.ac openbsd-compat/openssl-compat.{c,h}] |
| 2154 | EVP_DigestUpdate does not exactly match the other OLD_EVP functions (eg |
| 2155 | in openssl 0.9.6) so add an explicit test for it. |
Darren Tucker | 558d6ca | 2009-03-07 10:22:10 +1100 | [diff] [blame] | 2156 | |
Damien Miller | cee8523 | 2009-03-06 00:58:22 +1100 | [diff] [blame] | 2157 | 20090306 |
| 2158 | - (djm) OpenBSD CVS Sync |
| 2159 | - djm@cvs.openbsd.org 2009/03/05 07:18:19 |
| 2160 | [auth2-jpake.c jpake.c jpake.h monitor_wrap.c monitor_wrap.h schnorr.c] |
| 2161 | [sshconnect2.c] |
| 2162 | refactor the (disabled) Schnorr proof code to make it a little more |
| 2163 | generally useful |
Damien Miller | 447e387 | 2009-03-06 00:58:39 +1100 | [diff] [blame] | 2164 | - djm@cvs.openbsd.org 2009/03/05 11:30:50 |
| 2165 | [uuencode.c] |
| 2166 | document what these functions do so I don't ever have to recuse into |
| 2167 | b64_pton/ntop to remember their return values |
Damien Miller | cee8523 | 2009-03-06 00:58:22 +1100 | [diff] [blame] | 2168 | |
Damien Miller | 1991384 | 2009-02-23 10:53:58 +1100 | [diff] [blame] | 2169 | 20090223 |
| 2170 | - (djm) OpenBSD CVS Sync |
| 2171 | - djm@cvs.openbsd.org 2009/02/22 23:50:57 |
| 2172 | [ssh_config.5 sshd_config.5] |
| 2173 | don't advertise experimental options |
Damien Miller | 0296ae8 | 2009-02-23 11:00:24 +1100 | [diff] [blame] | 2174 | - djm@cvs.openbsd.org 2009/02/22 23:59:25 |
| 2175 | [sshd_config.5] |
| 2176 | missing period |
Damien Miller | 582ca6b | 2009-02-23 11:09:25 +1100 | [diff] [blame] | 2177 | - djm@cvs.openbsd.org 2009/02/23 00:06:15 |
| 2178 | [version.h] |
| 2179 | openssh-5.2 |
Damien Miller | 5d0d530 | 2009-02-23 11:11:57 +1100 | [diff] [blame] | 2180 | - (djm) [README] update for 5.2 |
Damien Miller | faec50b | 2009-02-23 11:12:29 +1100 | [diff] [blame] | 2181 | - (djm) Release openssh-5.2p1 |
Damien Miller | 1991384 | 2009-02-23 10:53:58 +1100 | [diff] [blame] | 2182 | |
Damien Miller | 9eab956 | 2009-02-22 08:47:02 +1100 | [diff] [blame] | 2183 | 20090222 |
| 2184 | - (djm) OpenBSD CVS Sync |
| 2185 | - tobias@cvs.openbsd.org 2009/02/21 19:32:04 |
| 2186 | [misc.c sftp-server-main.c ssh-keygen.c] |
| 2187 | Added missing newlines in error messages. |
| 2188 | ok dtucker |
| 2189 | |
Damien Miller | e8001d4 | 2009-02-21 12:45:02 +1100 | [diff] [blame] | 2190 | 20090221 |
| 2191 | - (djm) OpenBSD CVS Sync |
| 2192 | - djm@cvs.openbsd.org 2009/02/17 01:28:32 |
| 2193 | [ssh_config] |
| 2194 | sync with revised default ciphers; pointed out by dkrause@ |
Damien Miller | 2591838 | 2009-02-21 12:45:18 +1100 | [diff] [blame] | 2195 | - djm@cvs.openbsd.org 2009/02/18 04:31:21 |
| 2196 | [schnorr.c] |
| 2197 | signature should hash over the entire group, not just the generator |
| 2198 | (this is still disabled code) |
Damien Miller | 7691e5f | 2009-02-21 18:03:04 +1100 | [diff] [blame] | 2199 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
| 2200 | [contrib/suse/openssh.spec] Prepare for 5.2p1 |
Damien Miller | e8001d4 | 2009-02-21 12:45:02 +1100 | [diff] [blame] | 2201 | |
Damien Miller | 3f94aaf | 2009-02-16 15:21:39 +1100 | [diff] [blame] | 2202 | 20090216 |
| 2203 | - (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh] |
| 2204 | [regress/putty-kex.sh regress/putty-transfer.sh] Downgrade disabled |
| 2205 | interop tests from FATAL error to a warning. Allows some interop |
| 2206 | tests to proceed if others are missing necessary prerequisites. |
Damien Miller | 9055172 | 2009-02-16 15:37:03 +1100 | [diff] [blame] | 2207 | - (djm) [configure.ac] support GNU/kFreeBSD and GNU/kOpensolaris |
| 2208 | systems; patch from Aurelien Jarno via rmh AT aybabtu.com |
Damien Miller | 3f94aaf | 2009-02-16 15:21:39 +1100 | [diff] [blame] | 2209 | |
Damien Miller | fdd66fc | 2009-02-14 16:26:19 +1100 | [diff] [blame] | 2210 | 20090214 |
| 2211 | - (djm) OpenBSD CVS Sync |
| 2212 | - dtucker@cvs.openbsd.org 2009/02/02 11:15:14 |
| 2213 | [sftp.c] |
| 2214 | Initialize a few variables to prevent spurious "may be used |
| 2215 | uninitialized" warnings from newer gcc's. ok djm@ |
Damien Miller | 4bf648f | 2009-02-14 16:28:21 +1100 | [diff] [blame] | 2216 | - djm@cvs.openbsd.org 2009/02/12 03:00:56 |
| 2217 | [canohost.c canohost.h channels.c channels.h clientloop.c readconf.c] |
| 2218 | [readconf.h serverloop.c ssh.c] |
| 2219 | support remote port forwarding with a zero listen port (-R0:...) to |
| 2220 | dyamically allocate a listen port at runtime (this is actually |
| 2221 | specified in rfc4254); bz#1003 ok markus@ |
Damien Miller | 330d585 | 2009-02-14 16:33:09 +1100 | [diff] [blame] | 2222 | - djm@cvs.openbsd.org 2009/02/12 03:16:01 |
| 2223 | [serverloop.c] |
| 2224 | tighten check for -R0:... forwarding: only allow dynamic allocation |
| 2225 | if want_reply is set in the packet |
Damien Miller | 923e8bb | 2009-02-14 16:33:31 +1100 | [diff] [blame] | 2226 | - djm@cvs.openbsd.org 2009/02/12 03:26:22 |
| 2227 | [monitor.c] |
| 2228 | some paranoia: check that the serialised key is really KEY_RSA before |
| 2229 | diddling its internals |
Damien Miller | e2f4cc5 | 2009-02-14 16:33:49 +1100 | [diff] [blame] | 2230 | - djm@cvs.openbsd.org 2009/02/12 03:42:09 |
| 2231 | [ssh.1] |
| 2232 | document -R0:... usage |
Damien Miller | 65fa4ca | 2009-02-14 16:34:05 +1100 | [diff] [blame] | 2233 | - djm@cvs.openbsd.org 2009/02/12 03:44:25 |
| 2234 | [ssh.1] |
| 2235 | consistency: Dq => Ql |
Damien Miller | 85c6d8a | 2009-02-14 16:34:21 +1100 | [diff] [blame] | 2236 | - djm@cvs.openbsd.org 2009/02/12 03:46:17 |
| 2237 | [ssh_config.5] |
| 2238 | document RemoteForward usage with 0 listen port |
Damien Miller | e379e10 | 2009-02-14 16:34:39 +1100 | [diff] [blame] | 2239 | - jmc@cvs.openbsd.org 2009/02/12 07:34:20 |
| 2240 | [ssh_config.5] |
| 2241 | kill trailing whitespace; |
Damien Miller | 61433be | 2009-02-14 16:35:01 +1100 | [diff] [blame] | 2242 | - markus@cvs.openbsd.org 2009/02/13 11:50:21 |
| 2243 | [packet.c] |
| 2244 | check for enc !=NULL in packet_start_discard |
Damien Miller | 6385e75 | 2009-02-14 18:00:52 +1100 | [diff] [blame] | 2245 | - djm@cvs.openbsd.org 2009/02/14 06:35:49 |
| 2246 | [PROTOCOL] |
| 2247 | mention that eow and no-more-sessions extensions are sent only to |
| 2248 | OpenSSH peers |
Damien Miller | fdd66fc | 2009-02-14 16:26:19 +1100 | [diff] [blame] | 2249 | |
| 2250 | 20090212 |
Damien Miller | 2de7624 | 2009-02-12 12:19:20 +1100 | [diff] [blame] | 2251 | - (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically |
| 2252 | set ownership and modes, so avoid explicitly setting them |
Damien Miller | 20e231f | 2009-02-12 13:12:21 +1100 | [diff] [blame] | 2253 | - (djm) [configure.ac loginrec.c] bz#1421: fix lastlog support for OSX. |
| 2254 | OSX provides a getlastlogxbyname function that automates the reading of |
| 2255 | a lastlog file. Also, the pututxline function will update lastlog so |
| 2256 | there is no need for loginrec.c to do it explicitly. Collapse some |
| 2257 | overly verbose code while I'm in there. |
Damien Miller | 2de7624 | 2009-02-12 12:19:20 +1100 | [diff] [blame] | 2258 | |
Darren Tucker | 642ebe5 | 2009-02-01 22:19:54 +1100 | [diff] [blame] | 2259 | 20090201 |
| 2260 | - (dtucker) [defines.h sshconnect.c] INET6_ADDRSTRLEN is now needed in |
| 2261 | channels.c too, so move the definition for non-IP6 platforms to defines.h |
| 2262 | where it can be shared. |
| 2263 | |
Tim Rice | 6a32534 | 2009-01-29 12:30:01 -0800 | [diff] [blame] | 2264 | 20090129 |
| 2265 | - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen. |
| 2266 | If the CYGWIN environment variable is empty, the installer script |
| 2267 | should not install the service with an empty CYGWIN variable, but |
| 2268 | rather without setting CYGWNI entirely. |
Tim Rice | 0d8f2f3 | 2009-01-29 12:40:30 -0800 | [diff] [blame] | 2269 | - (tim) [contrib/cygwin/ssh-host-config] Whitespace cleanup. No code changes. |
Tim Rice | 6a32534 | 2009-01-29 12:30:01 -0800 | [diff] [blame] | 2270 | |
Tim Rice | ca3692d | 2009-01-28 12:50:04 -0800 | [diff] [blame] | 2271 | 20090128 |
| 2272 | - (tim) [contrib/cygwin/ssh-host-config] Patch from Corinna Vinschen. |
| 2273 | Changes to work on Cygwin 1.5.x as well as on the new Cygwin 1.7.x. |
| 2274 | The information given for the setting of the CYGWIN environment variable |
| 2275 | is wrong for both releases so I just removed it, together with the |
| 2276 | unnecessary (Cygwin 1.5.x) or wrong (Cygwin 1.7.x) default setting. |
| 2277 | |
Damien Miller | b53d8a1 | 2009-01-28 16:13:04 +1100 | [diff] [blame] | 2278 | 20081228 |
| 2279 | - (djm) OpenBSD CVS Sync |
| 2280 | - stevesk@cvs.openbsd.org 2008/12/09 03:20:42 |
| 2281 | [channels.c servconf.c] |
| 2282 | channel_print_adm_permitted_opens() should deal with all the printing |
| 2283 | for that config option. suggested by markus@; ok markus@ djm@ |
| 2284 | dtucker@ |
Damien Miller | c30def9 | 2009-01-28 16:13:39 +1100 | [diff] [blame] | 2285 | - djm@cvs.openbsd.org 2008/12/09 04:32:22 |
| 2286 | [auth2-chall.c] |
| 2287 | replace by-hand string building with xasprinf(); ok deraadt@ |
Damien Miller | 62fd18a | 2009-01-28 16:14:09 +1100 | [diff] [blame] | 2288 | - sobrado@cvs.openbsd.org 2008/12/09 15:35:00 |
| 2289 | [sftp.1 sftp.c] |
| 2290 | update for the synopses displayed by the 'help' command, there are a |
| 2291 | few missing flags; add 'bye' to the output of 'help'; sorting and spacing. |
| 2292 | jmc@ suggested replacing .Oo/.Oc with a single .Op macro. |
| 2293 | ok jmc@ |
Damien Miller | b3f2c9f | 2009-01-28 16:15:30 +1100 | [diff] [blame] | 2294 | - stevesk@cvs.openbsd.org 2008/12/09 22:37:33 |
| 2295 | [clientloop.c] |
| 2296 | fix typo in error message |
Damien Miller | 7375fe2 | 2009-01-28 16:16:00 +1100 | [diff] [blame] | 2297 | - stevesk@cvs.openbsd.org 2008/12/10 03:55:20 |
| 2298 | [addrmatch.c] |
| 2299 | o cannot be NULL here but use xfree() to be consistent; ok djm@ |
Damien Miller | b2c17d4 | 2009-01-28 16:18:03 +1100 | [diff] [blame] | 2300 | - stevesk@cvs.openbsd.org 2008/12/29 01:12:36 |
| 2301 | [ssh-keyscan.1] |
| 2302 | fix example, default key type is rsa for 3+ years; from |
| 2303 | frederic.perrin@resel.fr |
Damien Miller | a70ac76 | 2009-01-28 16:19:52 +1100 | [diff] [blame] | 2304 | - stevesk@cvs.openbsd.org 2008/12/29 02:23:26 |
| 2305 | [pathnames.h] |
| 2306 | no need to escape single quotes in comments |
Damien Miller | 1781901 | 2009-01-28 16:20:17 +1100 | [diff] [blame] | 2307 | - okan@cvs.openbsd.org 2008/12/30 00:46:56 |
| 2308 | [sshd_config.5] |
| 2309 | add AllowAgentForwarding to available Match keywords list |
| 2310 | ok djm |
Damien Miller | 7a60621 | 2009-01-28 16:22:34 +1100 | [diff] [blame] | 2311 | - djm@cvs.openbsd.org 2009/01/01 21:14:35 |
| 2312 | [channels.c] |
| 2313 | call channel destroy callbacks on receipt of open failure messages. |
| 2314 | fixes client hangs when connecting to a server that has MaxSessions=0 |
| 2315 | set spotted by imorgan AT nas.nasa.gov; ok markus@ |
Damien Miller | ccf7e22 | 2009-01-28 16:23:06 +1100 | [diff] [blame] | 2316 | - djm@cvs.openbsd.org 2009/01/01 21:17:36 |
| 2317 | [kexgexs.c] |
| 2318 | fix hash calculation for KEXGEX: hash over the original client-supplied |
| 2319 | values and not the sanity checked versions that we acutally use; |
| 2320 | bz#1540 reported by john.smith AT arrows.demon.co.uk |
| 2321 | ok markus@ |
Damien Miller | 1781f53 | 2009-01-28 16:24:41 +1100 | [diff] [blame] | 2322 | - djm@cvs.openbsd.org 2009/01/14 01:38:06 |
| 2323 | [channels.c] |
| 2324 | support SOCKS4A protocol, from dwmw2 AT infradead.org via bz#1482; |
| 2325 | "looks ok" markus@ |
Damien Miller | 5bc6aae | 2009-01-28 16:27:31 +1100 | [diff] [blame] | 2326 | - stevesk@cvs.openbsd.org 2009/01/15 17:38:43 |
| 2327 | [readconf.c] |
| 2328 | 1) use obsolete instead of alias for consistency |
| 2329 | 2) oUserKnownHostsFile not obsolete but oGlobalKnownHostsFile2 is |
| 2330 | so move the comment. |
| 2331 | 3) reorder so like options are together |
| 2332 | ok djm@ |
Damien Miller | a1c1b6c | 2009-01-28 16:29:49 +1100 | [diff] [blame] | 2333 | - djm@cvs.openbsd.org 2009/01/22 09:46:01 |
| 2334 | [channels.c channels.h session.c] |
| 2335 | make Channel->path an allocated string, saving a few bytes here and |
| 2336 | there and fixing bz#1380 in the process; ok markus@ |
Damien Miller | 9576ac4 | 2009-01-28 16:30:33 +1100 | [diff] [blame] | 2337 | - djm@cvs.openbsd.org 2009/01/22 09:49:57 |
| 2338 | [channels.c] |
| 2339 | oops! I committed the wrong version of the Channel->path diff, |
| 2340 | it was missing some tweaks suggested by stevesk@ |
Damien Miller | 3dc71ad | 2009-01-28 16:31:22 +1100 | [diff] [blame] | 2341 | - djm@cvs.openbsd.org 2009/01/22 10:02:34 |
| 2342 | [clientloop.c misc.c readconf.c readconf.h servconf.c servconf.h] |
| 2343 | [serverloop.c ssh-keyscan.c ssh.c sshd.c] |
| 2344 | make a2port() return -1 when it encounters an invalid port number |
| 2345 | rather than 0, which it will now treat as valid (needed for future work) |
| 2346 | adjust current consumers of a2port() to check its return value is <= 0, |
| 2347 | which in turn required some things to be converted from u_short => int |
| 2348 | make use of int vs. u_short consistent in some other places too |
| 2349 | feedback & ok markus@ |
Damien Miller | e37dde0 | 2009-01-28 16:33:01 +1100 | [diff] [blame] | 2350 | - djm@cvs.openbsd.org 2009/01/22 10:09:16 |
| 2351 | [auth-options.c] |
| 2352 | another chunk of a2port() diff that got away. wtfdjm?? |
Damien Miller | 67081b5 | 2009-01-28 16:33:31 +1100 | [diff] [blame] | 2353 | - djm@cvs.openbsd.org 2009/01/23 07:58:11 |
| 2354 | [myproposal.h] |
| 2355 | prefer CTR modes and revised arcfour (i.e w/ discard) modes to CBC |
| 2356 | modes; ok markus@ |
Damien Miller | 9aa72ba | 2009-01-28 16:34:00 +1100 | [diff] [blame] | 2357 | - naddy@cvs.openbsd.org 2009/01/24 17:10:22 |
| 2358 | [ssh_config.5 sshd_config.5] |
| 2359 | sync list of preferred ciphers; ok djm@ |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 2360 | - markus@cvs.openbsd.org 2009/01/26 09:58:15 |
| 2361 | [cipher.c cipher.h packet.c] |
| 2362 | Work around the CPNI-957037 Plaintext Recovery Attack by always |
| 2363 | reading 256K of data on packet size or HMAC errors (in CBC mode only). |
| 2364 | Help, feedback and ok djm@ |
| 2365 | Feedback from Martin Albrecht and Paterson Kenny |
Damien Miller | b53d8a1 | 2009-01-28 16:13:04 +1100 | [diff] [blame] | 2366 | |
Tim Rice | 351529c | 2009-01-07 10:04:12 -0800 | [diff] [blame] | 2367 | 20090107 |
Damien Miller | 1598d6b | 2009-01-21 16:04:24 +1100 | [diff] [blame] | 2368 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. |
| 2369 | Patch based on one from vgiffin AT apple.com; ok dtucker@ |
Damien Miller | 819dbb6 | 2009-01-21 16:46:26 +1100 | [diff] [blame] | 2370 | - (djm) [channels.c] bz#1419: support "on demand" X11 forwarding via |
| 2371 | launchd on OS X; patch from vgiffin AT apple.com, slightly tweaked; |
| 2372 | ok dtucker@ |
Damien Miller | 0266677 | 2009-01-21 20:29:20 +1100 | [diff] [blame] | 2373 | - (djm) [contrib/ssh-copy-id.1 contrib/ssh-copy-id] bz#1492: Make |
| 2374 | ssh-copy-id copy id_rsa.pub by default (instead of the legacy "identity" |
| 2375 | key). Patch from cjwatson AT debian.org |
Damien Miller | 1598d6b | 2009-01-21 16:04:24 +1100 | [diff] [blame] | 2376 | |
| 2377 | 20090107 |
Tim Rice | 351529c | 2009-01-07 10:04:12 -0800 | [diff] [blame] | 2378 | - (tim) [configure.ac defines.h openbsd-compat/port-uw.c |
| 2379 | openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI. |
| 2380 | OK djm@ dtucker@ |
Tim Rice | 2676791 | 2009-01-07 20:50:08 -0800 | [diff] [blame] | 2381 | - (tim) [configure.ac] Move check_for_libcrypt_later=1 in *-*-sysv5*) section. |
| 2382 | OpenServer 6 doesn't need libcrypt. |
Tim Rice | 351529c | 2009-01-07 10:04:12 -0800 | [diff] [blame] | 2383 | |
Damien Miller | 586b005 | 2008-12-09 14:11:32 +1100 | [diff] [blame] | 2384 | 20081209 |
| 2385 | - (djm) OpenBSD CVS Sync |
| 2386 | - djm@cvs.openbsd.org 2008/12/09 02:38:18 |
| 2387 | [clientloop.c] |
| 2388 | The ~C escape handler does not work correctly for multiplexed sessions - |
| 2389 | it opens a commandline on the master session, instead of on the slave |
| 2390 | that requested it. Disable it on slave sessions until such time as it |
| 2391 | is fixed; bz#1543 report from Adrian Bridgett via Colin Watson |
| 2392 | ok markus@ |
Damien Miller | 1be2cc4 | 2008-12-09 14:11:49 +1100 | [diff] [blame] | 2393 | - djm@cvs.openbsd.org 2008/12/09 02:39:59 |
| 2394 | [sftp.c] |
| 2395 | Deal correctly with failures in remote stat() operation in sftp, |
| 2396 | correcting fail-on-error behaviour in batchmode. bz#1541 report and |
| 2397 | fix from anedvedicky AT gmail.com; ok markus@ |
Damien Miller | 0d772d9 | 2008-12-09 14:12:05 +1100 | [diff] [blame] | 2398 | - djm@cvs.openbsd.org 2008/12/09 02:58:16 |
| 2399 | [readconf.c] |
| 2400 | don't leave junk (free'd) pointers around in Forward *fwd argument on |
| 2401 | failure; avoids double-free in ~C -L handler when given an invalid |
| 2402 | forwarding specification; bz#1539 report from adejong AT debian.org |
| 2403 | via Colin Watson; ok markus@ dtucker@ |
Damien Miller | 7ebfad7 | 2008-12-09 14:12:33 +1100 | [diff] [blame] | 2404 | - djm@cvs.openbsd.org 2008/12/09 03:02:37 |
| 2405 | [sftp.1 sftp.c] |
| 2406 | correct sftp(1) and corresponding usage syntax; |
| 2407 | bz#1518 patch from imorgan AT nas.nasa.gov; ok deraadt@ improved diff jmc@ |
Damien Miller | 586b005 | 2008-12-09 14:11:32 +1100 | [diff] [blame] | 2408 | |
Damien Miller | 7df2e40 | 2008-12-08 09:35:36 +1100 | [diff] [blame] | 2409 | 20081208 |
| 2410 | - (djm) [configure.ac] bz#1538: better test for ProPolice/SSP: actually |
| 2411 | use some stack in main(). |
| 2412 | Report and suggested fix from vapier AT gentoo.org |
Damien Miller | 8533c78 | 2008-12-08 09:54:40 +1100 | [diff] [blame] | 2413 | - (djm) OpenBSD CVS Sync |
| 2414 | - markus@cvs.openbsd.org 2008/12/02 19:01:07 |
| 2415 | [clientloop.c] |
| 2416 | we have to use the recipient's channel number (RFC 4254) for |
| 2417 | SSH2_MSG_CHANNEL_SUCCESS/SSH2_MSG_CHANNEL_FAILURE messages, |
| 2418 | otherwise we trigger 'Non-public channel' error messages on sshd |
| 2419 | systems with clientkeepalive enabled; noticed by sturm; ok djm; |
Damien Miller | 5a33ec6 | 2008-12-08 09:55:02 +1100 | [diff] [blame] | 2420 | - markus@cvs.openbsd.org 2008/12/02 19:08:59 |
| 2421 | [serverloop.c] |
| 2422 | backout 1.149, since it's not necessary and openssh clients send |
| 2423 | broken CHANNEL_FAILURE/SUCCESS messages since about 2004; ok djm@ |
Damien Miller | 16a7307 | 2008-12-08 09:55:25 +1100 | [diff] [blame] | 2424 | - markus@cvs.openbsd.org 2008/12/02 19:09:38 |
| 2425 | [channels.c] |
| 2426 | s/remote_id/id/ to be more consistent with other code; ok djm@ |
Damien Miller | 7df2e40 | 2008-12-08 09:35:36 +1100 | [diff] [blame] | 2427 | |
Darren Tucker | 83795d6 | 2008-12-01 21:34:28 +1100 | [diff] [blame] | 2428 | 20081201 |
| 2429 | - (dtucker) [contrib/cygwin/{Makefile,ssh-host-config}] Add new doc files |
| 2430 | and tweak the is-sshd-running check in ssh-host-config. Patch from |
| 2431 | vinschen at redhat com. |
Darren Tucker | 99d11a3 | 2008-12-01 21:40:48 +1100 | [diff] [blame] | 2432 | - (dtucker) OpenBSD CVS Sync |
| 2433 | - markus@cvs.openbsd.org 2008/11/21 15:47:38 |
| 2434 | [packet.c] |
| 2435 | packet_disconnect() on padding error, too. should reduce the success |
| 2436 | probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18 |
| 2437 | ok djm@ |
Darren Tucker | 2364564 | 2008-12-01 21:42:13 +1100 | [diff] [blame] | 2438 | - dtucker@cvs.openbsd.org 2008/11/30 11:59:26 |
| 2439 | [monitor_fdpass.c] |
| 2440 | Retry sendmsg/recvmsg on EAGAIN and EINTR; ok djm@ |
Darren Tucker | 83795d6 | 2008-12-01 21:34:28 +1100 | [diff] [blame] | 2441 | |
Darren Tucker | 69087ea | 2008-11-23 14:03:19 +1100 | [diff] [blame] | 2442 | 20081123 |
| 2443 | - (dtucker) [monitor_fdpass.c] Reduce diff vs OpenBSD by moving some |
| 2444 | declarations, removing an unnecessary union member and adding whitespace. |
Darren Tucker | d3782b4 | 2008-11-23 19:05:53 +1100 | [diff] [blame] | 2445 | cmsgbuf.tmp thing spotted by des at des no, ok djm some time ago. |
Darren Tucker | 69087ea | 2008-11-23 14:03:19 +1100 | [diff] [blame] | 2446 | |
Tim Rice | 0f4d2c0 | 2008-11-18 21:26:41 -0800 | [diff] [blame] | 2447 | 20081118 |
| 2448 | - (tim) [addrmatch.c configure.ac] Some platforms do not have sin6_scope_id |
| 2449 | member of sockaddr_in6. Also reported in Bug 1491 by David Leonard. OK and |
| 2450 | feedback by djm@ |
| 2451 | |
Darren Tucker | ff4350e | 2008-11-11 16:31:05 +1100 | [diff] [blame] | 2452 | 20081111 |
| 2453 | - (dtucker) OpenBSD CVS Sync |
| 2454 | - jmc@cvs.openbsd.org 2008/11/05 11:22:54 |
| 2455 | [servconf.c] |
| 2456 | passord -> password; |
| 2457 | fixes user/5975 from Rene Maroufi |
Darren Tucker | e15fb09 | 2008-11-11 16:31:43 +1100 | [diff] [blame] | 2458 | - stevesk@cvs.openbsd.org 2008/11/07 00:42:12 |
| 2459 | [ssh-keygen.c] |
| 2460 | spelling/typo in comment |
Darren Tucker | b57fab6 | 2008-11-11 16:32:25 +1100 | [diff] [blame] | 2461 | - stevesk@cvs.openbsd.org 2008/11/07 18:50:18 |
| 2462 | [nchan.c] |
| 2463 | add space to some log/debug messages for readability; ok djm@ markus@ |
Darren Tucker | c6d744e | 2008-11-11 16:33:03 +1100 | [diff] [blame] | 2464 | - dtucker@cvs.openbsd.org 2008/11/07 23:34:48 |
| 2465 | [auth2-jpake.c] |
| 2466 | Move JPAKE define to make life easier for portable. ok djm@ |
Darren Tucker | 63917bd | 2008-11-11 16:33:48 +1100 | [diff] [blame] | 2467 | - tobias@cvs.openbsd.org 2008/11/09 12:34:47 |
| 2468 | [session.c ssh.1] |
| 2469 | typo fixed (overriden -> overridden) |
| 2470 | ok espie, jmc |
Darren Tucker | 49c31c4 | 2008-11-11 16:39:44 +1100 | [diff] [blame] | 2471 | - stevesk@cvs.openbsd.org 2008/11/11 02:58:09 |
| 2472 | [servconf.c] |
| 2473 | USE_AFS not referenced so remove #ifdef. fixes sshd -T not printing |
| 2474 | kerberosgetafstoken. ok dtucker@ |
| 2475 | (Id sync only, we still want the ifdef in portable) |
Darren Tucker | 22662e8 | 2008-11-11 16:40:22 +1100 | [diff] [blame] | 2476 | - stevesk@cvs.openbsd.org 2008/11/11 03:55:11 |
| 2477 | [channels.c] |
| 2478 | for sshd -T print 'permitopen any' vs. 'permitopen' for case of no |
| 2479 | permitopen's; ok and input dtucker@ |
Darren Tucker | 4a6f62d | 2008-11-11 16:55:25 +1100 | [diff] [blame] | 2480 | - djm@cvs.openbsd.org 2008/11/10 02:06:35 |
| 2481 | [regress/putty-ciphers.sh] |
| 2482 | PuTTY supports AES CTR modes, so interop test against them too |
Darren Tucker | ff4350e | 2008-11-11 16:31:05 +1100 | [diff] [blame] | 2483 | |
Damien Miller | 7fc5c0f | 2008-11-05 16:12:11 +1100 | [diff] [blame] | 2484 | 20081105 |
| 2485 | - OpenBSD CVS Sync |
| 2486 | - djm@cvs.openbsd.org 2008/11/03 08:59:41 |
| 2487 | [servconf.c] |
| 2488 | include MaxSessions in sshd -T output; patch from imorgan AT nas.nasa.gov |
Damien Miller | 6f66d34 | 2008-11-05 16:12:54 +1100 | [diff] [blame] | 2489 | - djm@cvs.openbsd.org 2008/11/04 07:58:09 |
| 2490 | [auth.c] |
| 2491 | need unistd.h for close() prototype |
| 2492 | (ID sync only) |
Damien Miller | 01ed227 | 2008-11-05 16:20:46 +1100 | [diff] [blame] | 2493 | - djm@cvs.openbsd.org 2008/11/04 08:22:13 |
| 2494 | [auth.h auth2.c monitor.c monitor.h monitor_wrap.c monitor_wrap.h] |
| 2495 | [readconf.c readconf.h servconf.c servconf.h ssh2.h ssh_config.5] |
| 2496 | [sshconnect2.c sshd_config.5 jpake.c jpake.h schnorr.c auth2-jpake.c] |
| 2497 | [Makefile.in] |
| 2498 | Add support for an experimental zero-knowledge password authentication |
| 2499 | method using the J-PAKE protocol described in F. Hao, P. Ryan, |
| 2500 | "Password Authenticated Key Exchange by Juggling", 16th Workshop on |
| 2501 | Security Protocols, Cambridge, April 2008. |
| 2502 | |
| 2503 | This method allows password-based authentication without exposing |
| 2504 | the password to the server. Instead, the client and server exchange |
| 2505 | cryptographic proofs to demonstrate of knowledge of the password while |
| 2506 | revealing nothing useful to an attacker or compromised endpoint. |
| 2507 | |
| 2508 | This is experimental, work-in-progress code and is presently |
| 2509 | compiled-time disabled (turn on -DJPAKE in Makefile.inc). |
| 2510 | |
| 2511 | "just commit it. It isn't too intrusive." deraadt@ |
Damien Miller | 1a0442f | 2008-11-05 16:30:06 +1100 | [diff] [blame] | 2512 | - stevesk@cvs.openbsd.org 2008/11/04 19:18:00 |
| 2513 | [readconf.c] |
| 2514 | because parse_forward() is now used to parse all forward types (DLR), |
| 2515 | and it malloc's space for host variables, we don't need to malloc |
| 2516 | here. fixes small memory leaks. |
| 2517 | |
| 2518 | previously dynamic forwards were not parsed in parse_forward() and |
| 2519 | space was not malloc'd in that case. |
| 2520 | |
| 2521 | ok djm@ |
Damien Miller | 0164cb8 | 2008-11-05 16:30:31 +1100 | [diff] [blame] | 2522 | - stevesk@cvs.openbsd.org 2008/11/05 03:23:09 |
| 2523 | [clientloop.c ssh.1] |
| 2524 | add dynamic forward escape command line; ok djm@ |
Damien Miller | 7fc5c0f | 2008-11-05 16:12:11 +1100 | [diff] [blame] | 2525 | |
Damien Miller | 9f6fb56 | 2008-11-03 19:15:44 +1100 | [diff] [blame] | 2526 | 20081103 |
| 2527 | - OpenBSD CVS Sync |
| 2528 | - sthen@cvs.openbsd.org 2008/07/24 23:55:30 |
| 2529 | [ssh-keygen.1] |
| 2530 | Add "ssh-keygen -F -l" to synopsis (displays fingerprint from |
| 2531 | known_hosts). ok djm@ |
| 2532 | - grunk@cvs.openbsd.org 2008/07/25 06:56:35 |
| 2533 | [ssh_config] |
| 2534 | Add VisualHostKey to example file, ok djm@ |
Damien Miller | c6aadd9 | 2008-11-03 19:16:20 +1100 | [diff] [blame] | 2535 | - grunk@cvs.openbsd.org 2008/07/25 07:05:16 |
| 2536 | [key.c] |
| 2537 | In random art visualization, make sure to use the end marker only at the |
| 2538 | end. Initial diff by Dirk Loss, tweaks and ok djm@ |
Damien Miller | c674d58 | 2008-11-03 19:16:57 +1100 | [diff] [blame] | 2539 | - markus@cvs.openbsd.org 2008/07/31 14:48:28 |
| 2540 | [sshconnect2.c] |
| 2541 | don't allocate space for empty banners; report t8m at centrum.cz; |
| 2542 | ok deraadt |
Damien Miller | fa51b16 | 2008-11-03 19:17:33 +1100 | [diff] [blame] | 2543 | - krw@cvs.openbsd.org 2008/08/02 04:29:51 |
| 2544 | [ssh_config.5] |
| 2545 | whitepsace -> whitespace. From Matthew Clarke via bugs@. |
Damien Miller | ad793d5 | 2008-11-03 19:17:57 +1100 | [diff] [blame] | 2546 | - djm@cvs.openbsd.org 2008/08/21 04:09:57 |
| 2547 | [session.c] |
| 2548 | allow ForceCommand internal-sftp with arguments. based on patch from |
| 2549 | michael.barabanov AT gmail.com; ok markus@ |
Damien Miller | 15bce6b | 2008-11-03 19:19:12 +1100 | [diff] [blame] | 2550 | - djm@cvs.openbsd.org 2008/09/06 12:24:13 |
| 2551 | [kex.c] |
| 2552 | OpenSSL 0.9.8h supplies a real EVP_sha256 so we do not need our |
| 2553 | replacement anymore |
| 2554 | (ID sync only for portable - we still need this) |
Damien Miller | 456e6f0 | 2008-11-03 19:20:10 +1100 | [diff] [blame] | 2555 | - markus@cvs.openbsd.org 2008/09/11 14:22:37 |
| 2556 | [compat.c compat.h nchan.c ssh.c] |
| 2557 | only send eow and no-more-sessions requests to openssh 5 and newer; |
| 2558 | fixes interop problems with broken ssh v2 implementations; ok djm@ |
Damien Miller | d58f560 | 2008-11-03 19:20:49 +1100 | [diff] [blame] | 2559 | - millert@cvs.openbsd.org 2008/10/02 14:39:35 |
| 2560 | [session.c] |
| 2561 | Convert an unchecked strdup to xstrdup. OK deraadt@ |
Damien Miller | 49b78d4 | 2008-11-03 19:21:21 +1100 | [diff] [blame] | 2562 | - jmc@cvs.openbsd.org 2008/10/03 13:08:12 |
| 2563 | [sshd.8] |
| 2564 | do not give an example of how to chmod files: we can presume the user |
| 2565 | knows that. removes an ambiguity in the permission of authorized_keys; |
| 2566 | ok deraadt |
Damien Miller | c4d1b36 | 2008-11-03 19:22:09 +1100 | [diff] [blame] | 2567 | - deraadt@cvs.openbsd.org 2008/10/03 23:56:28 |
| 2568 | [sshconnect2.c] |
| 2569 | Repair strnvis() buffersize of 4*n+1, with termination gauranteed by the |
| 2570 | function. |
| 2571 | spotted by des@freebsd, who commited an incorrect fix to the freebsd tree |
| 2572 | and (as is fairly typical) did not report the problem to us. But this fix |
| 2573 | is correct. |
| 2574 | ok djm |
Damien Miller | e272a5b | 2008-11-03 19:22:37 +1100 | [diff] [blame] | 2575 | - djm@cvs.openbsd.org 2008/10/08 23:34:03 |
| 2576 | [ssh.1 ssh.c] |
| 2577 | Add -y option to force logging via syslog rather than stderr. |
| 2578 | Useful for daemonised ssh connection (ssh -f). Patch originally from |
| 2579 | and ok'd by markus@ |
Damien Miller | 51bde60 | 2008-11-03 19:23:10 +1100 | [diff] [blame] | 2580 | - djm@cvs.openbsd.org 2008/10/09 03:50:54 |
| 2581 | [servconf.c sshd_config.5] |
| 2582 | support setting PermitEmptyPasswords in a Match block |
| 2583 | requested in PR3891; ok dtucker@ |
Damien Miller | c13c3ee | 2008-11-03 19:23:28 +1100 | [diff] [blame] | 2584 | - jmc@cvs.openbsd.org 2008/10/09 06:54:22 |
| 2585 | [ssh.c] |
| 2586 | add -y to usage(); |
Damien Miller | b4acb47 | 2008-11-03 19:23:45 +1100 | [diff] [blame] | 2587 | - stevesk@cvs.openbsd.org 2008/10/10 04:55:16 |
| 2588 | [scp.c] |
| 2589 | spelling in comment; ok djm@ |
Damien Miller | 2f54ada | 2008-11-03 19:24:16 +1100 | [diff] [blame] | 2590 | - stevesk@cvs.openbsd.org 2008/10/10 05:00:12 |
| 2591 | [key.c] |
| 2592 | typo in error message; ok djm@ |
Damien Miller | ece92c8 | 2008-11-03 19:25:03 +1100 | [diff] [blame] | 2593 | - stevesk@cvs.openbsd.org 2008/10/10 16:43:27 |
| 2594 | [ssh_config.5] |
| 2595 | use 'Privileged ports can be forwarded only when logging in as root on |
| 2596 | the remote machine.' for RemoteForward just like ssh.1 -R. |
| 2597 | ok djm@ jmc@ |
| 2598 | - stevesk@cvs.openbsd.org 2008/10/14 18:11:33 |
| 2599 | [sshconnect.c] |
| 2600 | use #define ROQUIET here; no binary change. ok dtucker@ |
Damien Miller | a414cd3 | 2008-11-03 19:25:21 +1100 | [diff] [blame] | 2601 | - stevesk@cvs.openbsd.org 2008/10/17 18:36:24 |
| 2602 | [ssh_config.5] |
| 2603 | correct and clarify VisualHostKey; ok jmc@ |
Damien Miller | e7261c7 | 2008-11-03 19:25:40 +1100 | [diff] [blame] | 2604 | - stevesk@cvs.openbsd.org 2008/10/30 19:31:16 |
| 2605 | [clientloop.c sshd.c] |
| 2606 | don't need to #include "monitor_fdpass.h" |
Damien Miller | 2b20a92 | 2008-11-03 19:26:00 +1100 | [diff] [blame] | 2607 | - stevesk@cvs.openbsd.org 2008/10/31 15:05:34 |
| 2608 | [dispatch.c] |
| 2609 | remove unused #define DISPATCH_MIN; ok markus@ |
Damien Miller | f7475d7 | 2008-11-03 19:26:18 +1100 | [diff] [blame] | 2610 | - djm@cvs.openbsd.org 2008/11/01 04:50:08 |
| 2611 | [sshconnect2.c] |
| 2612 | sprinkle ARGSUSED on dispatch handlers |
| 2613 | nuke stale unusued prototype |
Damien Miller | a009433 | 2008-11-03 19:26:35 +1100 | [diff] [blame] | 2614 | - stevesk@cvs.openbsd.org 2008/11/01 06:43:33 |
| 2615 | [channels.c] |
| 2616 | fix some typos in log messages; ok djm@ |
Damien Miller | c1719f7 | 2008-11-03 19:27:07 +1100 | [diff] [blame] | 2617 | - sobrado@cvs.openbsd.org 2008/11/01 11:14:36 |
| 2618 | [ssh-keyscan.1 ssh-keyscan.c] |
| 2619 | the ellipsis is not an optional argument; while here, improve spacing. |
Damien Miller | a699d95 | 2008-11-03 19:27:34 +1100 | [diff] [blame] | 2620 | - stevesk@cvs.openbsd.org 2008/11/01 17:40:33 |
| 2621 | [clientloop.c readconf.c readconf.h ssh.c] |
| 2622 | merge dynamic forward parsing into parse_forward(); |
| 2623 | 'i think this is OK' djm@ |
Damien Miller | 660d7da | 2008-11-03 19:27:52 +1100 | [diff] [blame] | 2624 | - stevesk@cvs.openbsd.org 2008/11/02 00:16:16 |
| 2625 | [ttymodes.c] |
| 2626 | protocol 2 tty modes support is now 7.5 years old so remove these |
| 2627 | debug3()s; ok deraadt@ |
Damien Miller | a279d25 | 2008-11-03 19:28:07 +1100 | [diff] [blame] | 2628 | - stevesk@cvs.openbsd.org 2008/11/03 01:07:02 |
| 2629 | [readconf.c] |
| 2630 | remove valueless comment |
Damien Miller | f4b3953 | 2008-11-03 19:28:21 +1100 | [diff] [blame] | 2631 | - stevesk@cvs.openbsd.org 2008/11/03 02:44:41 |
| 2632 | [readconf.c] |
| 2633 | fix comment |
Damien Miller | 85dec73 | 2008-11-03 20:16:01 +1100 | [diff] [blame] | 2634 | - (djm) [contrib/caldera/ssh-host-keygen contrib/suse/rc.sshd] |
| 2635 | Make example scripts generate keys with default sizes rather than fixed, |
| 2636 | non-default 1024 bits; patch from imorgan AT nas.nasa.gov |
Damien Miller | 250071f | 2008-11-03 20:18:12 +1100 | [diff] [blame] | 2637 | - (djm) [contrib/sshd.pam.generic contrib/caldera/sshd.pam] |
| 2638 | [contrib/redhat/sshd.pam] Move pam_nologin to account group from |
| 2639 | incorrect auth group in example files; |
| 2640 | patch from imorgan AT nas.nasa.gov |
Damien Miller | 9f6fb56 | 2008-11-03 19:15:44 +1100 | [diff] [blame] | 2641 | |
Darren Tucker | c570ff7 | 2008-09-06 18:20:57 +1000 | [diff] [blame] | 2642 | 20080906 |
| 2643 | - (dtucker) [config.guess config.sub] Update to latest versions from |
| 2644 | http://git.savannah.gnu.org/gitweb/ (2008-04-14 and 2008-06-16 |
| 2645 | respectively). |
| 2646 | |
Darren Tucker | 661f63b | 2008-08-30 07:32:37 +1000 | [diff] [blame] | 2647 | 20080830 |
| 2648 | - (dtucker) [openbsd-compat/bsd-poll.c] correctly check for number of FDs |
| 2649 | larger than FD_SETSIZE (OpenSSH only ever uses poll with one fd). Patch |
| 2650 | from Nicholas Marriott. |
| 2651 | |
Damien Miller | aa5f433 | 2008-07-21 18:20:39 +1000 | [diff] [blame] | 2652 | 20080721 |
| 2653 | - (djm) OpenBSD CVS Sync |
Damien Miller | 6ef430d | 2008-07-23 17:40:04 +1000 | [diff] [blame] | 2654 | - djm@cvs.openbsd.org 2008/07/23 07:36:55 |
| 2655 | [servconf.c] |
| 2656 | do not try to print options that have been compile-time disabled |
| 2657 | in config test mode (sshd -T); report from nix-corp AT esperi.org.uk |
| 2658 | ok dtucker@ |
Damien Miller | 212f0b0 | 2008-07-23 17:42:29 +1000 | [diff] [blame] | 2659 | - (djm) [servconf.c] Print UsePAM option in config test mode (when it |
| 2660 | has been compiled in); report from nix-corp AT esperi.org.uk |
| 2661 | ok dtucker@ |
Damien Miller | 6ef430d | 2008-07-23 17:40:04 +1000 | [diff] [blame] | 2662 | |
| 2663 | 20080721 |
| 2664 | - (djm) OpenBSD CVS Sync |
Damien Miller | aa5f433 | 2008-07-21 18:20:39 +1000 | [diff] [blame] | 2665 | - jmc@cvs.openbsd.org 2008/07/18 22:51:01 |
| 2666 | [sftp-server.8] |
| 2667 | no need for .Pp before or after .Sh; |
Damien Miller | aaae43e | 2008-07-21 18:21:05 +1000 | [diff] [blame] | 2668 | - djm@cvs.openbsd.org 2008/07/21 08:19:07 |
| 2669 | [version.h] |
| 2670 | openssh-5.1 |
Damien Miller | 1f8909c | 2008-07-21 18:21:52 +1000 | [diff] [blame] | 2671 | - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
| 2672 | [contrib/suse/openssh.spec] Update version number in README and RPM specs |
Damien Miller | 8f42e9b | 2008-07-21 18:22:25 +1000 | [diff] [blame] | 2673 | - (djm) Release OpenSSH-5.1 |
Damien Miller | aa5f433 | 2008-07-21 18:20:39 +1000 | [diff] [blame] | 2674 | |
Damien Miller | 7ba0ca7 | 2008-07-17 18:57:06 +1000 | [diff] [blame] | 2675 | 20080717 |
| 2676 | - (djm) OpenBSD CVS Sync |
| 2677 | - djm@cvs.openbsd.org 2008/07/17 08:48:00 |
| 2678 | [sshconnect2.c] |
| 2679 | strnvis preauth banner; pointed out by mpf@ ok markus@ |
Damien Miller | a1d03a5 | 2008-07-17 18:57:19 +1000 | [diff] [blame] | 2680 | - djm@cvs.openbsd.org 2008/07/17 08:51:07 |
| 2681 | [auth2-hostbased.c] |
| 2682 | strip trailing '.' from hostname when HostbasedUsesNameFromPacketOnly=yes |
| 2683 | report and patch from res AT qoxp.net (bz#1200); ok markus@ |
Darren Tucker | 9a3f2b4 | 2008-07-17 19:03:49 +1000 | [diff] [blame] | 2684 | - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Remove long-unneeded compat |
| 2685 | code, replace with equivalent cygwin library call. Patch from vinschen |
Damien Miller | 2e28d86 | 2008-07-17 19:15:43 +1000 | [diff] [blame] | 2686 | at redhat.com, ok djm@. |
| 2687 | - (djm) [sshconnect2.c] vis.h isn't available everywhere |
Damien Miller | 7ba0ca7 | 2008-07-17 18:57:06 +1000 | [diff] [blame] | 2688 | |
Damien Miller | 94717b0 | 2008-07-16 21:17:23 +1000 | [diff] [blame] | 2689 | 20080716 |
| 2690 | - OpenBSD CVS Sync |
| 2691 | - djm@cvs.openbsd.org 2008/07/15 02:23:14 |
| 2692 | [sftp.1] |
| 2693 | number of pipelined requests is now 64; |
| 2694 | prodded by Iain.Morgan AT nasa.gov |
Damien Miller | b9d3bee | 2008-07-16 22:40:52 +1000 | [diff] [blame] | 2695 | - djm@cvs.openbsd.org 2008/07/16 11:51:14 |
| 2696 | [clientloop.c] |
| 2697 | rename variable first_gc -> last_gc (since it is actually the last |
| 2698 | in the list). |
Damien Miller | 6ef1749 | 2008-07-16 22:42:06 +1000 | [diff] [blame] | 2699 | - djm@cvs.openbsd.org 2008/07/16 11:52:19 |
| 2700 | [channels.c] |
| 2701 | this loop index should be automatic, not static |
Damien Miller | 94717b0 | 2008-07-16 21:17:23 +1000 | [diff] [blame] | 2702 | |
Damien Miller | 81dec05 | 2008-07-14 11:28:29 +1000 | [diff] [blame] | 2703 | 20080714 |
| 2704 | - (djm) OpenBSD CVS Sync |
| 2705 | - sthen@cvs.openbsd.org 2008/07/13 21:22:52 |
| 2706 | [ssh-keygen.c] |
| 2707 | Change "ssh-keygen -F [host] -l" to not display random art unless |
| 2708 | -v is also specified, making it consistent with the manual and other |
| 2709 | uses of -l. |
| 2710 | ok grunk@ |
Damien Miller | 163886f | 2008-07-14 11:28:58 +1000 | [diff] [blame] | 2711 | - djm@cvs.openbsd.org 2008/07/13 22:13:07 |
| 2712 | [channels.c] |
| 2713 | use struct sockaddr_storage instead of struct sockaddr for accept(2) |
| 2714 | address argument. from visibilis AT yahoo.com in bz#1485; ok markus@ |
Damien Miller | 7f980d1 | 2008-07-14 11:29:24 +1000 | [diff] [blame] | 2715 | - djm@cvs.openbsd.org 2008/07/13 22:16:03 |
| 2716 | [sftp.c] |
| 2717 | increase number of piplelined requests so they properly fill the |
| 2718 | (recently increased) channel window. prompted by rapier AT psc.edu; |
| 2719 | ok markus@ |
Damien Miller | 276571c | 2008-07-14 12:09:57 +1000 | [diff] [blame] | 2720 | - djm@cvs.openbsd.org 2008/07/14 01:55:56 |
| 2721 | [sftp-server.8] |
| 2722 | mention requirement for /dev/log inside chroot when using sftp-server |
| 2723 | with ChrootDirectory |
Damien Miller | ce02e5e | 2008-07-14 12:02:24 +1000 | [diff] [blame] | 2724 | - (djm) [openbsd-compat/bindresvport.c] Rename variables s/sin/in/ to |
| 2725 | avoid clash with sin(3) function; reported by |
| 2726 | cristian.ionescu-idbohrn AT axis.com |
Damien Miller | 639ce59 | 2008-07-14 12:03:27 +1000 | [diff] [blame] | 2727 | - (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close() |
| 2728 | prototype; reported by cristian.ionescu-idbohrn AT axis.com |
Damien Miller | 36d7056 | 2008-07-14 12:04:43 +1000 | [diff] [blame] | 2729 | - (djm) [umac.c] Rename variable s/buffer_ptr/bufp/ to avoid clash; |
| 2730 | reported by cristian.ionescu-idbohrn AT axis.com |
Damien Miller | 1fc231c | 2008-07-14 12:12:52 +1000 | [diff] [blame] | 2731 | - (djm) [contrib/cygwin/Makefile contrib/cygwin/ssh-host-config] |
| 2732 | [contrib/cygwin/ssh-user-config contrib/cygwin/sshd-inetd] |
| 2733 | Revamped and simplified Cygwin ssh-host-config script that uses |
| 2734 | unified csih configuration tool. Requires recent Cygwin. |
| 2735 | Patch from vinschen AT redhat.com |
Damien Miller | 81dec05 | 2008-07-14 11:28:29 +1000 | [diff] [blame] | 2736 | |
Damien Miller | 2bcb866 | 2008-07-12 17:12:29 +1000 | [diff] [blame] | 2737 | 20080712 |
| 2738 | - (djm) OpenBSD CVS Sync |
| 2739 | - djm@cvs.openbsd.org 2008/07/12 04:52:50 |
| 2740 | [channels.c] |
| 2741 | unbreak; move clearing of cctx struct to before first use |
| 2742 | reported by dkrause@ |
Damien Miller | a034baf | 2008-07-12 17:12:49 +1000 | [diff] [blame] | 2743 | - djm@cvs.openbsd.org 2008/07/12 05:33:41 |
| 2744 | [scp.1] |
| 2745 | better description for -i flag: |
| 2746 | s/RSA authentication/public key authentication/ |
Damien Miller | c4657ef | 2008-07-14 21:37:36 +1000 | [diff] [blame] | 2747 | - (djm) [openbsd-compat/fake-rfc2553.c openbsd-compat/fake-rfc2553.h] |
| 2748 | return EAI_FAMILY when trying to lookup unsupported address family; |
| 2749 | from vinschen AT redhat.com |
Damien Miller | 2bcb866 | 2008-07-12 17:12:29 +1000 | [diff] [blame] | 2750 | |
Damien Miller | 2f7faf1 | 2008-07-11 17:34:35 +1000 | [diff] [blame] | 2751 | 20080711 |
| 2752 | - (djm) OpenBSD CVS Sync |
| 2753 | - stevesk@cvs.openbsd.org 2008/07/07 00:31:41 |
| 2754 | [ttymodes.c] |
| 2755 | we don't need arg after the debug3() was removed. from lint. |
| 2756 | ok djm@ |
Damien Miller | 87dd5f2 | 2008-07-11 17:35:09 +1000 | [diff] [blame] | 2757 | - stevesk@cvs.openbsd.org 2008/07/07 23:32:51 |
| 2758 | [key.c] |
| 2759 | /*NOTREACHED*/ for lint warning: |
| 2760 | warning: function key_equal falls off bottom without returning value |
| 2761 | ok djm@ |
Damien Miller | dda5fff | 2008-07-11 17:35:37 +1000 | [diff] [blame] | 2762 | - markus@cvs.openbsd.org 2008/07/10 18:05:58 |
| 2763 | [channels.c] |
| 2764 | missing bzero; from mickey; ok djm@ |
Damien Miller | b61f3fc | 2008-07-11 17:36:48 +1000 | [diff] [blame] | 2765 | - markus@cvs.openbsd.org 2008/07/10 18:08:11 |
| 2766 | [clientloop.c monitor.c monitor_wrap.c packet.c packet.h sshd.c] |
| 2767 | sync v1 and v2 traffic accounting; add it to sshd, too; |
| 2768 | ok djm@, dtucker@ |
Damien Miller | 2f7faf1 | 2008-07-11 17:34:35 +1000 | [diff] [blame] | 2769 | |
Damien Miller | d9648ee | 2008-07-09 00:21:12 +1000 | [diff] [blame] | 2770 | 20080709 |
| 2771 | - (djm) [Makefile.in] Print "all tests passed" when all regress tests pass |
Damien Miller | 773a7b9 | 2008-07-09 20:54:05 +1000 | [diff] [blame] | 2772 | - (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM |
| 2773 | account check failure path. The vulnerable format buffer is supplied |
| 2774 | from PAM and should not contain attacker-supplied data. |
Damien Miller | 7acf550 | 2008-07-09 20:54:37 +1000 | [diff] [blame] | 2775 | - (djm) [auth.c] Missing unistd.h for close() |
Damien Miller | 73193b3 | 2008-07-09 21:07:19 +1000 | [diff] [blame] | 2776 | - (djm) [configure.ac] Add -Wformat-security to CFLAGS for gcc 3.x and 4.x |
Damien Miller | d9648ee | 2008-07-09 00:21:12 +1000 | [diff] [blame] | 2777 | |
Damien Miller | 22989f1 | 2008-07-05 08:59:43 +1000 | [diff] [blame] | 2778 | 20080705 |
| 2779 | - (djm) [auth.c] Fixed test for locked account on HP/UX with shadowed |
| 2780 | passwords disabled. bz#1083 report & patch from senthilkumar_sen AT |
| 2781 | hotpop.com, w/ dtucker@ |
Damien Miller | 20d1694 | 2008-07-05 09:36:58 +1000 | [diff] [blame] | 2782 | - (djm) [atomicio.c configure.ac] Disable poll() fallback in atomiciov for |
| 2783 | Tru64. readv doesn't seem to be a comparable object there. |
| 2784 | bz#1386, patch from dtucker@ ok me |
Damien Miller | 42743cb | 2008-07-05 09:50:23 +1000 | [diff] [blame] | 2785 | - (djm) [Makefile.in] Pass though pass to conch for interop tests |
Damien Miller | ff2e492 | 2008-07-05 09:52:03 +1000 | [diff] [blame] | 2786 | - (djm) [configure.ac] unbreak: remove extra closing brace |
Damien Miller | d874fa5 | 2008-07-05 09:40:56 +1000 | [diff] [blame] | 2787 | - (djm) OpenBSD CVS Sync |
| 2788 | - djm@cvs.openbsd.org 2008/07/04 23:08:25 |
| 2789 | [packet.c] |
| 2790 | handle EINTR in packet_write_poll()l ok dtucker@ |
Damien Miller | 0b4d48b | 2008-07-05 09:44:53 +1000 | [diff] [blame] | 2791 | - djm@cvs.openbsd.org 2008/07/04 23:30:16 |
| 2792 | [auth1.c auth2.c] |
| 2793 | Make protocol 1 MaxAuthTries logic match protocol 2's. |
| 2794 | Do not treat the first protocol 2 authentication attempt as |
| 2795 | a failure IFF it is for method "none". |
| 2796 | Makes MaxAuthTries' user-visible behaviour identical for |
| 2797 | protocol 1 vs 2. |
| 2798 | ok dtucker@ |
Damien Miller | c9c96f2 | 2008-07-05 15:17:48 +1000 | [diff] [blame] | 2799 | - djm@cvs.openbsd.org 2008/07/05 05:16:01 |
| 2800 | [PROTOCOL] |
| 2801 | grammar |
Damien Miller | 22989f1 | 2008-07-05 08:59:43 +1000 | [diff] [blame] | 2802 | |
Darren Tucker | 7c99b1c | 2008-07-04 12:53:23 +1000 | [diff] [blame] | 2803 | 20080704 |
| 2804 | - (dtucker) OpenBSD CVS Sync |
| 2805 | - djm@cvs.openbsd.org 2008/07/02 13:30:34 |
| 2806 | [auth2.c] |
| 2807 | really really remove the freebie "none" auth try for protocol 2 |
Darren Tucker | 9a2a609 | 2008-07-04 12:53:50 +1000 | [diff] [blame] | 2808 | - djm@cvs.openbsd.org 2008/07/02 13:47:39 |
| 2809 | [ssh.1 ssh.c] |
| 2810 | When forking after authentication ("ssh -f") with ExitOnForwardFailure |
| 2811 | enabled, delay the fork until after replies for any -R forwards have |
| 2812 | been seen. Allows for robust detection of -R forward failure when |
| 2813 | using -f (similar to bz#92); ok dtucker@ |
Darren Tucker | f5cafb0 | 2008-07-04 12:54:25 +1000 | [diff] [blame] | 2814 | - otto@cvs.openbsd.org 2008/07/03 21:46:58 |
| 2815 | [auth2-pubkey.c] |
| 2816 | avoid nasty double free; ok dtucker@ djm@ |
Darren Tucker | b03fd02 | 2008-07-04 13:51:12 +1000 | [diff] [blame] | 2817 | - djm@cvs.openbsd.org 2008/07/04 03:44:59 |
| 2818 | [servconf.c groupaccess.h groupaccess.c] |
| 2819 | support negation of groups in "Match group" block (bz#1315); ok dtucker@ |
Darren Tucker | 2784f1f | 2008-07-04 13:51:45 +1000 | [diff] [blame] | 2820 | - dtucker@cvs.openbsd.org 2008/07/04 03:47:02 |
| 2821 | [monitor.c] |
| 2822 | Make debug a little clearer. ok djm@ |
Darren Tucker | 8c7a14e | 2008-07-04 17:08:58 +1000 | [diff] [blame] | 2823 | - djm@cvs.openbsd.org 2008/06/30 08:07:34 |
| 2824 | [regress/key-options.sh] |
| 2825 | shell portability: use "=" instead of "==" in test(1) expressions, |
| 2826 | double-quote string with backslash escaped / |
Darren Tucker | 5d6d70a | 2008-07-04 17:10:30 +1000 | [diff] [blame] | 2827 | - djm@cvs.openbsd.org 2008/06/30 10:31:11 |
| 2828 | [regress/{putty-transfer,putty-kex,putty-ciphers}.sh] |
| 2829 | remove "set -e" left over from debugging |
Darren Tucker | b01bac1 | 2008-07-04 17:11:30 +1000 | [diff] [blame] | 2830 | - djm@cvs.openbsd.org 2008/06/30 10:43:03 |
| 2831 | [regress/conch-ciphers.sh] |
| 2832 | explicitly disable conch options that could interfere with the test |
Darren Tucker | f7fa706 | 2008-07-04 14:10:19 +1000 | [diff] [blame] | 2833 | - (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link |
| 2834 | returns EXDEV. Patch from Mike Garrison, ok djm@ |
Damien Miller | d8968ad | 2008-07-04 23:10:49 +1000 | [diff] [blame] | 2835 | - (djm) [atomicio.c channels.c clientloop.c defines.h includes.h] |
| 2836 | [packet.c scp.c serverloop.c sftp-client.c ssh-agent.c ssh-keyscan.c] |
| 2837 | [sshd.c] Explicitly handle EWOULDBLOCK wherever we handle EAGAIN, on |
| 2838 | some platforms (HP nonstop) it is a distinct errno; |
| 2839 | bz#1467 reported by sconeu AT yahoo.com; ok dtucker@ |
| 2840 | |
Darren Tucker | 00f00f0 | 2008-07-02 22:31:31 +1000 | [diff] [blame] | 2841 | 20080702 |
| 2842 | - (dtucker) OpenBSD CVS Sync |
| 2843 | - djm@cvs.openbsd.org 2008/06/30 08:05:59 |
| 2844 | [PROTOCOL.agent] |
| 2845 | typo: s/constraint_date/constraint_data/ |
Darren Tucker | 8810dd4 | 2008-07-02 22:32:14 +1000 | [diff] [blame] | 2846 | - djm@cvs.openbsd.org 2008/06/30 12:15:39 |
| 2847 | [serverloop.c] |
| 2848 | only pass channel requests on session channels through to the session |
| 2849 | channel handler, avoiding spurious log messages; ok! markus@ |
Darren Tucker | 8748b96 | 2008-07-02 22:32:43 +1000 | [diff] [blame] | 2850 | - djm@cvs.openbsd.org 2008/06/30 12:16:02 |
| 2851 | [nchan.c] |
| 2852 | only send eow@openssh.com notifications for session channels; ok! markus@ |
Darren Tucker | 1f781b1 | 2008-07-02 22:33:16 +1000 | [diff] [blame] | 2853 | - djm@cvs.openbsd.org 2008/06/30 12:18:34 |
| 2854 | [PROTOCOL] |
| 2855 | clarify that eow@openssh.com is only sent on session channels |
Darren Tucker | 068e01f | 2008-07-02 22:33:55 +1000 | [diff] [blame] | 2856 | - dtucker@cvs.openbsd.org 2008/07/01 07:20:52 |
| 2857 | [sshconnect.c] |
| 2858 | Check ExitOnForwardFailure if forwardings are disabled due to a failed |
| 2859 | host key check. ok djm@ |
Darren Tucker | d7bdc0c | 2008-07-02 22:34:30 +1000 | [diff] [blame] | 2860 | - dtucker@cvs.openbsd.org 2008/07/01 07:24:22 |
| 2861 | [sshconnect.c sshd.c] |
| 2862 | Send CR LF during protocol banner exchanges, but only for Protocol 2 only, |
| 2863 | in order to comply with RFC 4253. bz #1443, ok djm@ |
Darren Tucker | f2e21de | 2008-07-02 22:35:00 +1000 | [diff] [blame] | 2864 | - stevesk@cvs.openbsd.org 2008/07/01 23:12:47 |
| 2865 | [PROTOCOL.agent] |
| 2866 | fix some typos; ok djm@ |
Darren Tucker | 7499b0c | 2008-07-02 22:35:43 +1000 | [diff] [blame] | 2867 | - djm@cvs.openbsd.org 2008/07/02 02:24:18 |
| 2868 | [sshd_config sshd_config.5 sshd.8 servconf.c] |
| 2869 | increase default size of ssh protocol 1 ephemeral key from 768 to 1024 |
| 2870 | bits; prodded by & ok dtucker@ ok deraadt@ |
Darren Tucker | 33c787f | 2008-07-02 22:37:30 +1000 | [diff] [blame] | 2871 | - dtucker@cvs.openbsd.org 2008/07/02 12:03:51 |
| 2872 | [auth-rsa.c auth.c auth2-pubkey.c auth.h] |
| 2873 | Merge duplicate host key file checks, based in part on a patch from Rob |
| 2874 | Holland via bz #1348 . Also checks for non-regular files during protocol |
| 2875 | 1 RSA auth. ok djm@ |
Darren Tucker | 4230a5d | 2008-07-02 22:56:09 +1000 | [diff] [blame] | 2876 | - djm@cvs.openbsd.org 2008/07/02 12:36:39 |
| 2877 | [auth2-none.c auth2.c] |
| 2878 | Make protocol 2 MaxAuthTries behaviour a little more sensible: |
| 2879 | Check whether client has exceeded MaxAuthTries before running |
| 2880 | an authentication method and skip it if they have, previously it |
| 2881 | would always allow one try (for "none" auth). |
| 2882 | Preincrement failure count before post-auth test - previously this |
| 2883 | checked and postincremented, also to allow one "none" try. |
| 2884 | Together, these two changes always count the "none" auth method |
| 2885 | which could be skipped by a malicious client (e.g. an SSH worm) |
| 2886 | to get an extra attempt at a real auth method. They also make |
| 2887 | MaxAuthTries=0 a useful way to block users entirely (esp. in a |
| 2888 | sshd_config Match block). |
| 2889 | Also, move sending of any preauth banner from "none" auth method |
| 2890 | to the first call to input_userauth_request(), so worms that skip |
| 2891 | the "none" method get to see it too. |
Darren Tucker | 00f00f0 | 2008-07-02 22:31:31 +1000 | [diff] [blame] | 2892 | |
Damien Miller | 2e80cf2 | 2008-06-30 08:06:25 +1000 | [diff] [blame] | 2893 | 20080630 |
| 2894 | - (djm) OpenBSD CVS Sync |
| 2895 | - dtucker@cvs.openbsd.org 2008/06/10 23:13:43 |
| 2896 | [regress/Makefile regress/key-options.sh] |
| 2897 | Add regress test for key options. ok djm@ |
Damien Miller | d9bfce8 | 2008-06-30 08:06:51 +1000 | [diff] [blame] | 2898 | - dtucker@cvs.openbsd.org 2008/06/11 23:11:40 |
Damien Miller | 4268a13 | 2008-06-30 08:07:56 +1000 | [diff] [blame] | 2899 | [regress/Makefile] |
Damien Miller | d9bfce8 | 2008-06-30 08:06:51 +1000 | [diff] [blame] | 2900 | Don't run cipher-speed test by default; mistakenly enabled by me |
Damien Miller | 4268a13 | 2008-06-30 08:07:56 +1000 | [diff] [blame] | 2901 | - djm@cvs.openbsd.org 2008/06/28 13:57:25 |
| 2902 | [regress/Makefile regress/test-exec.sh regress/conch-ciphers.sh] |
| 2903 | very basic regress test against Twisted Conch in "make interop" |
| 2904 | target (conch is available in ports/devel/py-twisted/conch); |
| 2905 | ok markus@ |
Damien Miller | a766cea | 2008-06-30 08:12:37 +1000 | [diff] [blame] | 2906 | - (djm) [regress/Makefile] search for conch by path, like we do putty |
Damien Miller | 2e80cf2 | 2008-06-30 08:06:25 +1000 | [diff] [blame] | 2907 | |
Damien Miller | f184bcf | 2008-06-29 22:45:13 +1000 | [diff] [blame] | 2908 | 20080629 |
| 2909 | - (djm) OpenBSD CVS Sync |
| 2910 | - martynas@cvs.openbsd.org 2008/06/21 07:46:46 |
| 2911 | [sftp.c] |
| 2912 | use optopt to get invalid flag, instead of return value of getopt, |
| 2913 | which is always '?'; ok djm@ |
Damien Miller | 007132a | 2008-06-29 22:45:37 +1000 | [diff] [blame] | 2914 | - otto@cvs.openbsd.org 2008/06/25 11:13:43 |
| 2915 | [key.c] |
| 2916 | add key length to visual fingerprint; zap magical constants; |
| 2917 | ok grunk@ djm@ |
Damien Miller | 9e72028 | 2008-06-29 22:46:35 +1000 | [diff] [blame] | 2918 | - djm@cvs.openbsd.org 2008/06/26 06:10:09 |
| 2919 | [sftp-client.c sftp-server.c] |
| 2920 | allow the sftp chmod(2)-equivalent operation to set set[ug]id/sticky |
| 2921 | bits. Note that this only affects explicit setting of modes (e.g. via |
| 2922 | sftp(1)'s chmod command) and not file transfers. (bz#1310) |
| 2923 | ok deraadt@ at c2k8 |
Damien Miller | 2e9cf49 | 2008-06-29 22:47:04 +1000 | [diff] [blame] | 2924 | - djm@cvs.openbsd.org 2008/06/26 09:19:40 |
| 2925 | [dh.c dh.h moduli.c] |
| 2926 | when loading moduli from /etc/moduli in sshd(8), check that they |
| 2927 | are of the expected "safe prime" structure and have had |
| 2928 | appropriate primality tests performed; |
| 2929 | feedback and ok dtucker@ |
Damien Miller | 1028824 | 2008-06-30 00:04:03 +1000 | [diff] [blame] | 2930 | - grunk@cvs.openbsd.org 2008/06/26 11:46:31 |
| 2931 | [readconf.c readconf.h ssh.1 ssh_config.5 sshconnect.c] |
| 2932 | Move SSH Fingerprint Visualization away from sharing the config option |
| 2933 | CheckHostIP to an own config option named VisualHostKey. |
| 2934 | While there, fix the behaviour that ssh would draw a random art picture |
| 2935 | on every newly seen host even when the option was not enabled. |
| 2936 | prodded by deraadt@, discussions, |
| 2937 | help and ok markus@ djm@ dtucker@ |
Damien Miller | 8639920 | 2008-06-30 00:04:31 +1000 | [diff] [blame] | 2938 | - jmc@cvs.openbsd.org 2008/06/26 21:11:46 |
| 2939 | [ssh.1] |
| 2940 | add VisualHostKey to the list of options listed in -o; |
Damien Miller | bd45afb | 2008-06-30 00:04:57 +1000 | [diff] [blame] | 2941 | - djm@cvs.openbsd.org 2008/06/28 07:25:07 |
| 2942 | [PROTOCOL] |
| 2943 | spelling fixes |
Damien Miller | 1cfadab | 2008-06-30 00:05:21 +1000 | [diff] [blame] | 2944 | - djm@cvs.openbsd.org 2008/06/28 13:58:23 |
| 2945 | [ssh-agent.c] |
| 2946 | refuse to add a key that has unknown constraints specified; |
| 2947 | ok markus |
Damien Miller | 471db5c | 2008-06-30 00:05:48 +1000 | [diff] [blame] | 2948 | - djm@cvs.openbsd.org 2008/06/28 14:05:15 |
| 2949 | [ssh-agent.c] |
| 2950 | reset global compat flag after processing a protocol 2 signature |
| 2951 | request with the legacy DSA encoding flag set; ok markus |
Damien Miller | 1e18beb | 2008-06-30 00:07:00 +1000 | [diff] [blame] | 2952 | - djm@cvs.openbsd.org 2008/06/28 14:08:30 |
| 2953 | [PROTOCOL PROTOCOL.agent] |
| 2954 | document the protocol used by ssh-agent; "looks ok" markus@ |
Damien Miller | f184bcf | 2008-06-29 22:45:13 +1000 | [diff] [blame] | 2955 | |
Damien Miller | 493f032 | 2008-06-28 16:01:35 +1000 | [diff] [blame] | 2956 | 20080628 |
| 2957 | - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec] |
| 2958 | RFC.nroff lacks a license, remove it (it is long gone in OpenBSD). |
| 2959 | |
Damien Miller | 60dcc62 | 2008-06-26 15:59:32 +1000 | [diff] [blame] | 2960 | 20080626 |
| 2961 | - (djm) [Makefile.in moduli.5] Include moduli(5) manpage from OpenBSD. |
| 2962 | (bz#1372) |
Damien Miller | f299ff8 | 2008-06-26 16:01:56 +1000 | [diff] [blame] | 2963 | - (djm) [ contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
| 2964 | [contrib/suse/openssh.spec] Include moduli.5 in RPM spec files. |
Damien Miller | 60dcc62 | 2008-06-26 15:59:32 +1000 | [diff] [blame] | 2965 | |
Darren Tucker | ed3cdc0 | 2008-06-16 23:29:18 +1000 | [diff] [blame] | 2966 | 20080616 |
| 2967 | - (dtucker) OpenBSD CVS Sync |
| 2968 | - dtucker@cvs.openbsd.org 2008/06/16 13:22:53 |
| 2969 | [session.c channels.c] |
| 2970 | Rename the isatty argument to is_tty so we don't shadow |
| 2971 | isatty(3). ok markus@ |
Darren Tucker | 1a48aec | 2008-06-16 23:35:56 +1000 | [diff] [blame] | 2972 | - (dtucker) [channels.c] isatty -> is_tty here too. |
Darren Tucker | ed3cdc0 | 2008-06-16 23:29:18 +1000 | [diff] [blame] | 2973 | |
Darren Tucker | 330c93f | 2008-06-16 02:27:48 +1000 | [diff] [blame] | 2974 | 20080615 |
| 2975 | - (dtucker) [configure.ac] Enable -fno-builtin-memset when using gcc. |
Damien Miller | 2a62847 | 2008-06-16 07:50:24 +1000 | [diff] [blame] | 2976 | - OpenBSD CVS Sync |
| 2977 | - dtucker@cvs.openbsd.org 2008/06/14 15:49:48 |
| 2978 | [sshd.c] |
| 2979 | wrap long line at 80 chars |
Damien Miller | 6ca16c6 | 2008-06-16 07:50:58 +1000 | [diff] [blame] | 2980 | - dtucker@cvs.openbsd.org 2008/06/14 17:07:11 |
| 2981 | [sshd.c] |
| 2982 | ensure default umask disallows at least group and world write; ok djm@ |
Damien Miller | 6051c94 | 2008-06-16 07:53:16 +1000 | [diff] [blame] | 2983 | - djm@cvs.openbsd.org 2008/06/14 18:33:43 |
| 2984 | [session.c] |
| 2985 | suppress the warning message from chdir(homedir) failures |
| 2986 | when chrooted (bz#1461); ok dtucker |
Damien Miller | c7ce0da | 2008-06-16 07:55:06 +1000 | [diff] [blame] | 2987 | - dtucker@cvs.openbsd.org 2008/06/14 19:42:10 |
| 2988 | [scp.1] |
| 2989 | Mention that scp follows symlinks during -r. bz #1466, |
| 2990 | from nectar at apple |
Damien Miller | c62a5af | 2008-06-16 07:55:46 +1000 | [diff] [blame] | 2991 | - dtucker@cvs.openbsd.org 2008/06/15 16:55:38 |
| 2992 | [sshd_config.5] |
| 2993 | MaxSessions is allowed in a Match block too |
Damien Miller | 307c1d1 | 2008-06-16 07:56:20 +1000 | [diff] [blame] | 2994 | - dtucker@cvs.openbsd.org 2008/06/15 16:58:40 |
| 2995 | [servconf.c sshd_config.5] |
| 2996 | Allow MaxAuthTries within a Match block. ok djm@ |
Damien Miller | d310d51 | 2008-06-16 07:59:23 +1000 | [diff] [blame] | 2997 | - djm@cvs.openbsd.org 2008/06/15 20:06:26 |
| 2998 | [channels.c channels.h session.c] |
| 2999 | don't call isatty() on a pty master, instead pass a flag down to |
| 3000 | channel_set_fds() indicating that te fds refer to a tty. Fixes a |
| 3001 | hang on exit on Solaris (bz#1463) in portable but is actually |
| 3002 | a generic bug; ok dtucker deraadt markus |
Darren Tucker | 330c93f | 2008-06-16 02:27:48 +1000 | [diff] [blame] | 3003 | |
Damien Miller | 8b7ab96 | 2008-06-15 10:55:34 +1000 | [diff] [blame] | 3004 | 20080614 |
| 3005 | - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction |
| 3006 | replacement code; patch from ighighi AT gmail.com in bz#1240; |
| 3007 | ok dtucker |
| 3008 | |
Darren Tucker | 99bb761 | 2008-06-13 22:02:50 +1000 | [diff] [blame] | 3009 | 20080613 |
| 3010 | - (dtucker) OpenBSD CVS Sync |
| 3011 | - deraadt@cvs.openbsd.org 2008/06/13 09:44:36 |
| 3012 | [packet.c] |
| 3013 | compile on older gcc; no decl after code |
Darren Tucker | f2c16d3 | 2008-06-14 08:59:49 +1000 | [diff] [blame] | 3014 | - dtucker@cvs.openbsd.org 2008/06/13 13:56:59 |
| 3015 | [monitor.c] |
| 3016 | Clear key options in the monitor on failed authentication, prevents |
| 3017 | applying additional restrictions to non-pubkey authentications in |
| 3018 | the case where pubkey fails but another method subsequently succeeds. |
| 3019 | bz #1472, found by Colin Watson, ok markus@ djm@ |
Darren Tucker | d9526a5 | 2008-06-14 09:01:24 +1000 | [diff] [blame] | 3020 | - dtucker@cvs.openbsd.org 2008/06/13 14:18:51 |
| 3021 | [auth2-pubkey.c auth-rhosts.c] |
| 3022 | Include unistd.h for close(), prevents warnings in -portable |
Darren Tucker | 47e713b | 2008-06-14 09:01:54 +1000 | [diff] [blame] | 3023 | - dtucker@cvs.openbsd.org 2008/06/13 17:21:20 |
| 3024 | [mux.c] |
| 3025 | Friendlier error messages for mux fallback. ok djm@ |
Darren Tucker | 03ccc9b | 2008-06-14 09:02:25 +1000 | [diff] [blame] | 3026 | - dtucker@cvs.openbsd.org 2008/06/13 18:55:22 |
| 3027 | [scp.c] |
| 3028 | Prevent -Wsign-compare warnings on LP64 systems. bz #1192, ok deraadt@ |
Darren Tucker | f6bffb1 | 2008-06-14 09:04:26 +1000 | [diff] [blame] | 3029 | - grunk@cvs.openbsd.org 2008/06/13 20:13:26 |
| 3030 | [ssh.1] |
| 3031 | Explain the use of SSH fpr visualization using random art, and cite the |
| 3032 | original scientific paper inspiring that technique. |
| 3033 | Much help with English and nroff by jmc@, thanks. |
Darren Tucker | 30fd49e | 2008-06-14 09:14:46 +1000 | [diff] [blame] | 3034 | - (dtucker) [configure.ac] Bug #1276: avoid linking against libgssapi, which |
| 3035 | despite its name doesn't seem to implement all of GSSAPI. Patch from |
| 3036 | Jan Engelhardt, sanity checked by Simon Wilkinson. |
Darren Tucker | 99bb761 | 2008-06-13 22:02:50 +1000 | [diff] [blame] | 3037 | |
Darren Tucker | 1199673 | 2008-06-13 04:32:00 +1000 | [diff] [blame] | 3038 | 20080612 |
| 3039 | - (dtucker) OpenBSD CVS Sync |
| 3040 | - jmc@cvs.openbsd.org 2008/06/11 07:30:37 |
| 3041 | [sshd.8] |
| 3042 | kill trailing whitespace; |
Darren Tucker | 9c16ac9 | 2008-06-13 04:40:35 +1000 | [diff] [blame] | 3043 | - grunk@cvs.openbsd.org 2008/06/11 21:01:35 |
| 3044 | [ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c |
| 3045 | sshconnect.c] |
| 3046 | Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the |
| 3047 | graphical hash visualization schemes known as "random art", and by |
| 3048 | Dan Kaminsky's musings on the subject during a BlackOp talk at the |
| 3049 | 23C3 in Berlin. |
| 3050 | Scientific publication (original paper): |
| 3051 | "Hash Visualization: a New Technique to improve Real-World Security", |
| 3052 | Perrig A. and Song D., 1999, International Workshop on Cryptographic |
| 3053 | Techniques and E-Commerce (CrypTEC '99) |
| 3054 | http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf |
| 3055 | The algorithm used here is a worm crawling over a discrete plane, |
| 3056 | leaving a trace (augmenting the field) everywhere it goes. |
| 3057 | Movement is taken from dgst_raw 2bit-wise. Bumping into walls |
| 3058 | makes the respective movement vector be ignored for this turn, |
| 3059 | thus switching to the other color of the chessboard. |
| 3060 | Graphs are not unambiguous for now, because circles in graphs can be |
| 3061 | walked in either direction. |
| 3062 | discussions with several people, |
| 3063 | help, corrections and ok markus@ djm@ |
Darren Tucker | a376a32 | 2008-06-13 04:42:14 +1000 | [diff] [blame] | 3064 | - grunk@cvs.openbsd.org 2008/06/11 21:38:25 |
| 3065 | [ssh-keygen.c] |
| 3066 | ssh-keygen -lv -f /etc/ssh/ssh_host_rsa_key.pub |
| 3067 | would not display you the random art as intended, spotted by canacar@ |
Darren Tucker | 35c4553 | 2008-06-13 04:43:15 +1000 | [diff] [blame] | 3068 | - grunk@cvs.openbsd.org 2008/06/11 22:20:46 |
| 3069 | [ssh-keygen.c ssh-keygen.1] |
| 3070 | ssh-keygen would write fingerprints to STDOUT, and random art to STDERR, |
| 3071 | that is not how it was envisioned. |
| 3072 | Also correct manpage saying that -v is needed along with -l for it to work. |
| 3073 | spotted by naddy@ |
Darren Tucker | 014d76f | 2008-06-13 04:43:51 +1000 | [diff] [blame] | 3074 | - otto@cvs.openbsd.org 2008/06/11 23:02:22 |
| 3075 | [key.c] |
| 3076 | simpler way of computing the augmentations; ok grunk@ |
Darren Tucker | dcc1ab5 | 2008-06-13 04:44:25 +1000 | [diff] [blame] | 3077 | - grunk@cvs.openbsd.org 2008/06/11 23:03:56 |
| 3078 | [ssh_config.5] |
| 3079 | CheckHostIP set to ``fingerprint'' will display both hex and random art |
| 3080 | spotted by naddy@ |
Darren Tucker | d32b28a | 2008-06-13 04:45:50 +1000 | [diff] [blame] | 3081 | - grunk@cvs.openbsd.org 2008/06/11 23:51:57 |
| 3082 | [key.c] |
| 3083 | #define statements that are not atoms need braces around them, else they |
| 3084 | will cause trouble in some cases. |
| 3085 | Also do a computation of -1 once, and not in a loop several times. |
| 3086 | spotted by otto@ |
Darren Tucker | 78913e0 | 2008-06-13 04:47:34 +1000 | [diff] [blame] | 3087 | - dtucker@cvs.openbsd.org 2008/06/12 00:03:49 |
| 3088 | [dns.c canohost.c sshconnect.c] |
| 3089 | Do not pass "0" strings as ports to getaddrinfo because the lookups |
| 3090 | can slow things down and we never use the service info anyway. bz |
| 3091 | #859, patch from YOSHIFUJI Hideaki and John Devitofranceschi. ok |
| 3092 | deraadt@ djm@ |
| 3093 | djm belives that the reason for the "0" strings is to ensure that |
| 3094 | it's not possible to call getaddrinfo with both host and port being |
| 3095 | NULL. In the case of canohost.c host is a local array. In the |
| 3096 | case of sshconnect.c, it's checked for null immediately before use. |
| 3097 | In dns.c it ultimately comes from ssh.c:main() and is guaranteed to |
| 3098 | be non-null but it's not obvious, so I added a warning message in |
| 3099 | case it is ever passed a null. |
| 3100 | - grunk@cvs.openbsd.org 2008/06/12 00:13:55 |
| 3101 | [sshconnect.c] |
| 3102 | Make ssh print the random art also when ssh'ing to a host using IP only. |
| 3103 | spotted by naddy@, ok and help djm@ dtucker@ |
Darren Tucker | 267e28b | 2008-06-13 04:48:11 +1000 | [diff] [blame] | 3104 | - otto@cvs.openbsd.org 2008/06/12 00:13:13 |
| 3105 | [key.c] |
| 3106 | use an odd number of rows and columns and a separate start marker, looks |
| 3107 | better; ok grunk@ |
Darren Tucker | 2fb66ca | 2008-06-13 04:49:33 +1000 | [diff] [blame] | 3108 | - djm@cvs.openbsd.org 2008/06/12 03:40:52 |
| 3109 | [clientloop.h mux.c channels.c clientloop.c channels.h] |
| 3110 | Enable ~ escapes for multiplex slave sessions; give each channel |
| 3111 | its own escape state and hook the escape filters up to muxed |
| 3112 | channels. bz #1331 |
| 3113 | Mux slaves do not currently support the ~^Z and ~& escapes. |
| 3114 | NB. this change cranks the mux protocol version, so a new ssh |
| 3115 | mux client will not be able to connect to a running old ssh |
| 3116 | mux master. |
| 3117 | ok dtucker@ |
Darren Tucker | 9f407c4 | 2008-06-13 04:50:27 +1000 | [diff] [blame] | 3118 | - djm@cvs.openbsd.org 2008/06/12 04:06:00 |
| 3119 | [clientloop.h ssh.c clientloop.c] |
| 3120 | maintain an ordered queue of outstanding global requests that we |
| 3121 | expect replies to, similar to the per-channel confirmation queue. |
| 3122 | Use this queue to verify success or failure for remote forward |
| 3123 | establishment in a race free way. |
| 3124 | ok dtucker@ |
Darren Tucker | 4d5cd33 | 2008-06-13 04:51:14 +1000 | [diff] [blame] | 3125 | - djm@cvs.openbsd.org 2008/06/12 04:17:47 |
| 3126 | [clientloop.c] |
| 3127 | thall shalt not code past the eightieth column |
Darren Tucker | d6173c0 | 2008-06-13 04:52:53 +1000 | [diff] [blame] | 3128 | - djm@cvs.openbsd.org 2008/06/12 04:24:06 |
| 3129 | [ssh.c] |
| 3130 | thal shalt not code past the eightieth column |
Darren Tucker | e5d9829 | 2008-06-13 04:53:27 +1000 | [diff] [blame] | 3131 | - djm@cvs.openbsd.org 2008/06/12 05:15:41 |
| 3132 | [PROTOCOL] |
| 3133 | document tun@openssh.com forwarding method |
Darren Tucker | ba69c7a | 2008-06-13 04:54:05 +1000 | [diff] [blame] | 3134 | - djm@cvs.openbsd.org 2008/06/12 05:32:30 |
| 3135 | [mux.c] |
| 3136 | some more TODO for me |
Darren Tucker | 4b3b977 | 2008-06-13 04:55:10 +1000 | [diff] [blame] | 3137 | - grunk@cvs.openbsd.org 2008/06/12 05:42:46 |
| 3138 | [key.c] |
| 3139 | supply the key type (rsa1, rsa, dsa) as a caption in the frame of the |
| 3140 | random art. while there, stress the fact that the field base should at |
| 3141 | least be 8 characters for the pictures to make sense. |
| 3142 | comment and ok djm@ |
| 3143 | - grunk@cvs.openbsd.org 2008/06/12 06:32:59 |
| 3144 | [key.c] |
| 3145 | We already mark the start of the worm, now also mark the end of the worm |
| 3146 | in our random art drawings. |
| 3147 | ok djm@ |
Darren Tucker | 84c56f5 | 2008-06-13 04:55:46 +1000 | [diff] [blame] | 3148 | - djm@cvs.openbsd.org 2008/06/12 15:19:17 |
| 3149 | [clientloop.h channels.h clientloop.c channels.c mux.c] |
| 3150 | The multiplexing escape char handler commit last night introduced a |
| 3151 | small memory leak per session; plug it. |
Darren Tucker | f6b01b7 | 2008-06-13 04:56:37 +1000 | [diff] [blame] | 3152 | - dtucker@cvs.openbsd.org 2008/06/12 16:35:31 |
| 3153 | [ssh_config.5 ssh.c] |
| 3154 | keyword expansion for localcommand. ok djm@ |
Darren Tucker | f09e825 | 2008-06-13 05:18:03 +1000 | [diff] [blame] | 3155 | - jmc@cvs.openbsd.org 2008/06/12 19:10:09 |
| 3156 | [ssh_config.5 ssh-keygen.1] |
| 3157 | tweak the ascii art text; ok grunk |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 3158 | - dtucker@cvs.openbsd.org 2008/06/12 20:38:28 |
| 3159 | [sshd.c sshconnect.c packet.h misc.c misc.h packet.c] |
| 3160 | Make keepalive timeouts apply while waiting for a packet, particularly |
| 3161 | during key renegotiation (bz #1363). With djm and Matt Day, ok djm@ |
Darren Tucker | a64ab33 | 2008-06-13 07:01:29 +1000 | [diff] [blame] | 3162 | - djm@cvs.openbsd.org 2008/06/12 20:47:04 |
| 3163 | [sftp-client.c] |
| 3164 | print extension revisions for extensions that we understand |
Darren Tucker | babc1d5 | 2008-06-13 08:56:01 +1000 | [diff] [blame] | 3165 | - djm@cvs.openbsd.org 2008/06/12 21:06:25 |
| 3166 | [clientloop.c] |
| 3167 | I was coalescing expected global request confirmation replies at |
| 3168 | the wrong end of the queue - fix; prompted by markus@ |
Darren Tucker | b68fb4a | 2008-06-13 08:57:27 +1000 | [diff] [blame] | 3169 | - grunk@cvs.openbsd.org 2008/06/12 21:14:46 |
| 3170 | [ssh-keygen.c] |
| 3171 | make ssh-keygen -lf show the key type just as ssh-add -l would do it |
| 3172 | ok djm@ markus@ |
Darren Tucker | 0f0ef0a | 2008-06-13 08:58:05 +1000 | [diff] [blame] | 3173 | - grunk@cvs.openbsd.org 2008/06/12 22:03:36 |
| 3174 | [key.c] |
| 3175 | add my copyright, ok djm@ |
Darren Tucker | ff4454d | 2008-06-13 10:21:51 +1000 | [diff] [blame] | 3176 | - ian@cvs.openbsd.org 2008/06/12 23:24:58 |
| 3177 | [sshconnect.c] |
| 3178 | tweak wording in message, ok deraadt@ jmc@ |
Darren Tucker | f8b7eb7 | 2008-06-13 10:22:54 +1000 | [diff] [blame] | 3179 | - dtucker@cvs.openbsd.org 2008/06/13 00:12:02 |
| 3180 | [sftp.h log.h] |
| 3181 | replace __dead with __attribute__((noreturn)), makes things |
| 3182 | a little easier to port. Also, add it to sigdie(). ok djm@ |
Darren Tucker | ca19bfe | 2008-06-13 10:24:03 +1000 | [diff] [blame] | 3183 | - djm@cvs.openbsd.org 2008/06/13 00:16:49 |
| 3184 | [mux.c] |
| 3185 | fall back to creating a new TCP connection on most multiplexing errors |
| 3186 | (socket connect fail, invalid version, refused permittion, corrupted |
| 3187 | messages, etc.); bz #1329 ok dtucker@ |
Darren Tucker | 1adfd36 | 2008-06-13 10:58:10 +1000 | [diff] [blame] | 3188 | - dtucker@cvs.openbsd.org 2008/06/13 00:47:53 |
| 3189 | [mux.c] |
| 3190 | upcast size_t to u_long to match format arg; ok djm@ |
Darren Tucker | c7e030f | 2008-06-13 10:58:50 +1000 | [diff] [blame] | 3191 | - dtucker@cvs.openbsd.org 2008/06/13 00:51:47 |
| 3192 | [mac.c] |
| 3193 | upcast another size_t to u_long to match format |
Darren Tucker | 7517b5b | 2008-06-13 14:48:59 +1000 | [diff] [blame] | 3194 | - dtucker@cvs.openbsd.org 2008/06/13 01:38:23 |
| 3195 | [misc.c] |
| 3196 | upcast uid to long with matching %ld, prevents warnings in portable |
Darren Tucker | 06db584 | 2008-06-13 14:51:28 +1000 | [diff] [blame] | 3197 | - djm@cvs.openbsd.org 2008/06/13 04:40:22 |
| 3198 | [auth2-pubkey.c auth-rhosts.c] |
| 3199 | refuse to read ~/.shosts or ~/.ssh/authorized_keys that are not |
| 3200 | regular files; report from Solar Designer via Colin Watson in bz#1471 |
| 3201 | ok dtucker@ deraadt |
Darren Tucker | 1cf65ae | 2008-06-13 05:09:18 +1000 | [diff] [blame] | 3202 | - (dtucker) [clientloop.c serverloop.c] channel_register_filter now |
| 3203 | takes 2 more args. with djm@ |
Darren Tucker | 61b0695 | 2008-06-13 10:28:57 +1000 | [diff] [blame] | 3204 | - (dtucker) [defines.h] Bug #1112: __dead is, well dead. Based on a patch |
| 3205 | from Todd Vierling. |
Darren Tucker | 2c1eb82 | 2008-06-13 11:13:13 +1000 | [diff] [blame] | 3206 | - (dtucker) [auth-sia.c] Bug #1241: support password expiry on Tru64 SIA |
| 3207 | systems. Patch from R. Scott Bailey. |
Darren Tucker | 2c91b28 | 2008-06-13 12:40:55 +1000 | [diff] [blame] | 3208 | - (dtucker) [umac.c] STORE_UINT32_REVERSED and endian_convert are never used |
| 3209 | on big endian machines, so ifdef them for little-endian only to prevent |
| 3210 | unused function warnings on big-endians. |
Darren Tucker | f387e59 | 2008-06-13 15:03:14 +1000 | [diff] [blame] | 3211 | - (dtucker) [openbsd-compat/setenv.c] Make offsets size_t to prevent |
| 3212 | compiler warnings on some platforms. Based on a discussion with otto@ |
Darren Tucker | 1199673 | 2008-06-13 04:32:00 +1000 | [diff] [blame] | 3213 | |
Damien Miller | 4401e45 | 2008-06-12 06:05:12 +1000 | [diff] [blame] | 3214 | 20080611 |
| 3215 | - (djm) [channels.c configure.ac] |
| 3216 | Do not set SO_REUSEADDR on wildcard X11 listeners (X11UseLocalhost=no) |
| 3217 | bz#1464; ok dtucker |
| 3218 | |
Darren Tucker | 7a3935d | 2008-06-10 22:59:10 +1000 | [diff] [blame] | 3219 | 20080610 |
| 3220 | - (dtucker) OpenBSD CVS Sync |
| 3221 | - djm@cvs.openbsd.org 2008/06/10 03:57:27 |
| 3222 | [servconf.c match.h sshd_config.5] |
| 3223 | support CIDR address matching in sshd_config "Match address" blocks, with |
| 3224 | full support for negation and fall-back to classic wildcard matching. |
| 3225 | For example: |
| 3226 | Match address 192.0.2.0/24,3ffe:ffff::/32,!10.* |
| 3227 | PasswordAuthentication yes |
| 3228 | addrmatch.c code mostly lifted from flowd's addr.c |
| 3229 | feedback and ok dtucker@ |
Darren Tucker | b06cc4a | 2008-06-10 22:59:53 +1000 | [diff] [blame] | 3230 | - djm@cvs.openbsd.org 2008/06/10 04:17:46 |
| 3231 | [sshd_config.5] |
| 3232 | better reference for pattern-list |
Darren Tucker | e7140f2 | 2008-06-10 23:01:51 +1000 | [diff] [blame] | 3233 | - dtucker@cvs.openbsd.org 2008/06/10 04:50:25 |
| 3234 | [sshd.c channels.h channels.c log.c servconf.c log.h servconf.h sshd.8] |
| 3235 | Add extended test mode (-T) and connection parameters for test mode (-C). |
| 3236 | -T causes sshd to write its effective configuration to stdout and exit. |
| 3237 | -C causes any relevant Match rules to be applied before output. The |
| 3238 | combination allows tesing of the parser and config files. ok deraadt djm |
Darren Tucker | 6a2a400 | 2008-06-10 23:03:04 +1000 | [diff] [blame] | 3239 | - jmc@cvs.openbsd.org 2008/06/10 07:12:00 |
| 3240 | [sshd_config.5] |
| 3241 | tweak previous; |
Darren Tucker | e7f3f75 | 2008-06-10 23:06:01 +1000 | [diff] [blame] | 3242 | - jmc@cvs.openbsd.org 2008/06/10 08:17:40 |
| 3243 | [sshd.8 sshd.c] |
| 3244 | - update usage() |
| 3245 | - fix SYNOPSIS, and sort options |
| 3246 | - some minor additional fixes |
Darren Tucker | d788b7c | 2008-06-10 23:15:54 +1000 | [diff] [blame] | 3247 | - dtucker@cvs.openbsd.org 2008/06/09 18:06:32 |
| 3248 | [regress/test-exec.sh] |
| 3249 | Don't generate putty keys if we're not going to use them. ok djm |
Darren Tucker | 10f9242 | 2008-06-10 23:16:46 +1000 | [diff] [blame] | 3250 | - dtucker@cvs.openbsd.org 2008/06/10 05:23:32 |
| 3251 | [regress/addrmatch.sh regress/Makefile] |
| 3252 | Regress test for Match CIDR rules. ok djm@ |
Darren Tucker | 5f34664 | 2008-06-11 01:38:52 +1000 | [diff] [blame] | 3253 | - dtucker@cvs.openbsd.org 2008/06/10 15:21:41 |
| 3254 | [test-exec.sh] |
| 3255 | Use a more portable construct for checking if we're running a putty test |
Darren Tucker | d8bafea | 2008-06-11 01:39:38 +1000 | [diff] [blame] | 3256 | - dtucker@cvs.openbsd.org 2008/06/10 15:28:49 |
| 3257 | [test-exec.sh] |
| 3258 | Add quotes |
Darren Tucker | c9807e8 | 2008-06-11 09:33:01 +1000 | [diff] [blame] | 3259 | - dtucker@cvs.openbsd.org 2008/06/10 18:21:24 |
| 3260 | [ssh_config.5] |
| 3261 | clarify that Host patterns are space-separated. ok deraadt |
Darren Tucker | 8901fa9 | 2008-06-11 09:34:01 +1000 | [diff] [blame] | 3262 | - djm@cvs.openbsd.org 2008/06/10 22:15:23 |
| 3263 | [PROTOCOL ssh.c serverloop.c] |
| 3264 | Add a no-more-sessions@openssh.com global request extension that the |
| 3265 | client sends when it knows that it will never request another session |
| 3266 | (i.e. when session multiplexing is disabled). This allows a server to |
| 3267 | disallow further session requests and terminate the session. |
| 3268 | Why would a non-multiplexing client ever issue additional session |
| 3269 | requests? It could have been attacked with something like SSH'jack: |
| 3270 | http://www.storm.net.nz/projects/7 |
| 3271 | feedback & ok markus |
Darren Tucker | 896ad5a | 2008-06-11 09:34:46 +1000 | [diff] [blame] | 3272 | - djm@cvs.openbsd.org 2008/06/10 23:06:19 |
| 3273 | [auth-options.c match.c servconf.c addrmatch.c sshd.8] |
| 3274 | support CIDR address matching in .ssh/authorized_keys from="..." stanzas |
| 3275 | ok and extensive testing dtucker@ |
Darren Tucker | 2a8b138 | 2008-06-11 09:35:37 +1000 | [diff] [blame] | 3276 | - dtucker@cvs.openbsd.org 2008/06/10 23:21:34 |
| 3277 | [bufaux.c] |
| 3278 | Use '\0' for a nul byte rather than unadorned 0. ok djm@ |
Darren Tucker | e045e0c | 2008-06-11 09:38:12 +1000 | [diff] [blame] | 3279 | - dtucker@cvs.openbsd.org 2008/06/10 23:13:43 |
| 3280 | [Makefile regress/key-options.sh] |
| 3281 | Add regress test for key options. ok djm@ |
Darren Tucker | 5d37690 | 2008-06-11 04:15:05 +1000 | [diff] [blame] | 3282 | - (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6 |
| 3283 | since the new CIDR code in addmatch.c references it. |
| 3284 | - (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6 |
| 3285 | specific tests on platforms that don't do IPv6. |
Darren Tucker | 34f49c6 | 2008-06-11 05:15:51 +1000 | [diff] [blame] | 3286 | - (dtucker) [Makefile.in] Define TEST_SSH_IPV6 in make's arguments as well |
| 3287 | as environment. |
Darren Tucker | b8e0500 | 2008-06-11 09:47:59 +1000 | [diff] [blame] | 3288 | - (dtucker) [Makefile.in] Move addrmatch.o to libssh.a where it's needed now. |
Darren Tucker | 7a3935d | 2008-06-10 22:59:10 +1000 | [diff] [blame] | 3289 | |
Darren Tucker | 422c34c | 2008-06-09 22:48:31 +1000 | [diff] [blame] | 3290 | 20080609 |
| 3291 | - (dtucker) OpenBSD CVS Sync |
| 3292 | - dtucker@cvs.openbsd.org 2008/06/08 17:04:41 |
| 3293 | [sftp-server.c] |
| 3294 | Add case for ENOSYS in errno_to_portable; ok deraadt |
Darren Tucker | 7b59889 | 2008-06-09 22:49:36 +1000 | [diff] [blame] | 3295 | - dtucker@cvs.openbsd.org 2008/06/08 20:15:29 |
| 3296 | [sftp.c sftp-client.c sftp-client.h] |
| 3297 | Have the sftp client store the statvfs replies in wire format, |
| 3298 | which prevents problems when the server's native sizes exceed the |
| 3299 | client's. |
| 3300 | Also extends the sizes of the remaining 32bit wire format to 64bit, |
| 3301 | they're specified as unsigned long in the standard. |
Darren Tucker | 3463aca | 2008-06-09 23:06:55 +1000 | [diff] [blame] | 3302 | - dtucker@cvs.openbsd.org 2008/06/09 13:02:39 |
Darren Tucker | 588fe0e | 2008-06-09 23:52:22 +1000 | [diff] [blame] | 3303 | [sftp-server.c] |
Darren Tucker | 3463aca | 2008-06-09 23:06:55 +1000 | [diff] [blame] | 3304 | Extend 32bit -> 64bit values for statvfs extension missed in previous |
| 3305 | commit. |
Darren Tucker | 588fe0e | 2008-06-09 23:52:22 +1000 | [diff] [blame] | 3306 | - dtucker@cvs.openbsd.org 2008/06/09 13:38:46 |
| 3307 | [PROTOCOL] |
| 3308 | Use a $OpenBSD tag so our scripts will sync changes. |
Darren Tucker | 422c34c | 2008-06-09 22:48:31 +1000 | [diff] [blame] | 3309 | |
Darren Tucker | 598eaa6 | 2008-06-09 03:32:29 +1000 | [diff] [blame] | 3310 | 20080608 |
| 3311 | - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c |
| 3312 | openbsd-compat/Makefile.in openbsd-compat/openbsd-compat.h |
| 3313 | openbsd-compat/bsd-statvfs.{c,h}] Add a null implementation of statvfs and |
| 3314 | fstatvfs and remove #defines around statvfs code. ok djm@ |
Darren Tucker | 7700138 | 2008-06-09 06:17:53 +1000 | [diff] [blame] | 3315 | - (dtucker) [configure.ac defines.h sftp-client.c M sftp-server.c] Add a |
| 3316 | macro to convert fsid to unsigned long for platforms where fsid is a |
| 3317 | 2-member array. |
Darren Tucker | 598eaa6 | 2008-06-09 03:32:29 +1000 | [diff] [blame] | 3318 | |
Darren Tucker | ce38d82 | 2008-06-07 06:25:15 +1000 | [diff] [blame] | 3319 | 20080607 |
| 3320 | - (dtucker) [mux.c] Include paths.h inside ifdef HAVE_PATHS_H. |
Darren Tucker | 5b2e2ba | 2008-06-08 09:25:28 +1000 | [diff] [blame] | 3321 | - (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c] |
| 3322 | Do not enable statvfs extensions on platforms that do not have statvfs. |
Darren Tucker | 136e56f | 2008-06-08 12:49:30 +1000 | [diff] [blame] | 3323 | - (dtucker) OpenBSD CVS Sync |
| 3324 | - djm@cvs.openbsd.org 2008/05/19 06:14:02 |
| 3325 | [packet.c] unbreak protocol keepalive timeouts bz#1465; ok dtucker@ |
Darren Tucker | dd39264 | 2008-06-08 12:53:20 +1000 | [diff] [blame] | 3326 | - djm@cvs.openbsd.org 2008/05/19 15:45:07 |
| 3327 | [sshtty.c ttymodes.c sshpty.h] |
| 3328 | Fix sending tty modes when stdin is not a tty (bz#1199). Previously |
| 3329 | we would send the modes corresponding to a zeroed struct termios, |
| 3330 | whereas we should have been sending an empty list of modes. |
| 3331 | Based on patch from daniel.ritz AT alcatel.ch; ok dtucker@ markus@ |
Darren Tucker | 0f7e910 | 2008-06-08 12:54:29 +1000 | [diff] [blame] | 3332 | - djm@cvs.openbsd.org 2008/05/19 15:46:31 |
| 3333 | [ssh-keygen.c] |
| 3334 | support -l (print fingerprint) in combination with -F (find host) to |
| 3335 | search for a host in ~/.ssh/known_hosts and display its fingerprint; |
| 3336 | ok markus@ |
Darren Tucker | df189fb | 2008-06-08 12:55:32 +1000 | [diff] [blame] | 3337 | - djm@cvs.openbsd.org 2008/05/19 20:53:52 |
| 3338 | [clientloop.c] |
| 3339 | unbreak tree by committing this bit that I missed from: |
| 3340 | Fix sending tty modes when stdin is not a tty (bz#1199). Previously |
| 3341 | we would send the modes corresponding to a zeroed struct termios, |
| 3342 | whereas we should have been sending an empty list of modes. |
| 3343 | Based on patch from daniel.ritz AT alcatel.ch; ok dtucker@ markus@ |
Darren Tucker | ce38d82 | 2008-06-07 06:25:15 +1000 | [diff] [blame] | 3344 | |
Damien Miller | 58ea61b | 2008-06-04 10:54:00 +1000 | [diff] [blame] | 3345 | 20080604 |
| 3346 | - (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias |
| 3347 | in arc4random_uniform with upper_bound in (2^30,2*31). Note that |
| 3348 | OpenSSH did not make requests with upper bounds in this range. |
| 3349 | |
Damien Miller | a7058ec | 2008-05-20 08:57:06 +1000 | [diff] [blame] | 3350 | 20080519 |
| 3351 | - (djm) [configure.ac mux.c sftp.c openbsd-compat/Makefile.in] |
| 3352 | [openbsd-compat/fmt_scaled.c openbsd-compat/openbsd-compat.h] |
| 3353 | Fix compilation on Linux, including pulling in fmt_scaled(3) |
| 3354 | implementation from OpenBSD's libutil. |
| 3355 | |
Damien Miller | 797e3d1 | 2008-05-19 14:27:42 +1000 | [diff] [blame] | 3356 | 20080518 |
| 3357 | - (djm) OpenBSD CVS Sync |
| 3358 | - djm@cvs.openbsd.org 2008/04/04 05:14:38 |
| 3359 | [sshd_config.5] |
| 3360 | ChrootDirectory is supported in Match blocks (in fact, it is most useful |
| 3361 | there). Spotted by Minstrel AT minstrel.org.uk |
Damien Miller | 56f41dd | 2008-05-19 14:28:19 +1000 | [diff] [blame] | 3362 | - djm@cvs.openbsd.org 2008/04/04 06:44:26 |
| 3363 | [sshd_config.5] |
| 3364 | oops, some unrelated stuff crept into that commit - backout. |
| 3365 | spotted by jmc@ |
Damien Miller | 25434de | 2008-05-19 14:29:08 +1000 | [diff] [blame] | 3366 | - djm@cvs.openbsd.org 2008/04/05 02:46:02 |
| 3367 | [sshd_config.5] |
| 3368 | HostbasedAuthentication is supported under Match too |
Damien Miller | a4be7c2 | 2008-05-19 14:47:37 +1000 | [diff] [blame] | 3369 | - (djm) [openbsd-compat/bsd-arc4random.c openbsd-compat/openbsd-compat.c] |
| 3370 | [configure.ac] Implement arc4random_buf(), import implementation of |
| 3371 | arc4random_uniform() from OpenBSD |
Damien Miller | caaed01 | 2008-05-19 15:26:54 +1000 | [diff] [blame] | 3372 | - (djm) [openbsd-compat/bsd-arc4random.c] Warning fixes |
Damien Miller | 9417831 | 2008-05-19 15:28:35 +1000 | [diff] [blame] | 3373 | - (djm) [openbsd-compat/port-tun.c] needs sys/queue.h |
Damien Miller | 354c48c | 2008-05-19 14:50:00 +1000 | [diff] [blame] | 3374 | - (djm) OpenBSD CVS Sync |
| 3375 | - djm@cvs.openbsd.org 2008/04/13 00:22:17 |
| 3376 | [dh.c sshd.c] |
| 3377 | Use arc4random_buf() when requesting more than a single word of output |
| 3378 | Use arc4random_uniform() when the desired random number upper bound |
| 3379 | is not a power of two |
| 3380 | ok deraadt@ millert@ |
Damien Miller | d671e5a | 2008-05-19 14:53:33 +1000 | [diff] [blame] | 3381 | - djm@cvs.openbsd.org 2008/04/18 12:32:11 |
| 3382 | [sftp-client.c sftp-client.h sftp-server.c sftp.1 sftp.c sftp.h] |
| 3383 | introduce sftp extension methods statvfs@openssh.com and |
| 3384 | fstatvfs@openssh.com that implement statvfs(2)-like operations, |
| 3385 | based on a patch from miklos AT szeredi.hu (bz#1399) |
| 3386 | also add a "df" command to the sftp client that uses the |
| 3387 | statvfs@openssh.com to produce a df(1)-like display of filesystem |
| 3388 | space and inode utilisation |
| 3389 | ok markus@ |
Damien Miller | 64058cb | 2008-05-19 14:54:25 +1000 | [diff] [blame] | 3390 | - jmc@cvs.openbsd.org 2008/04/18 17:15:47 |
| 3391 | [sftp.1] |
| 3392 | macro fixage; |
Damien Miller | ff0dd88 | 2008-05-19 14:55:02 +1000 | [diff] [blame] | 3393 | - djm@cvs.openbsd.org 2008/04/18 22:01:33 |
| 3394 | [session.c] |
| 3395 | remove unneccessary parentheses |
Damien Miller | 0b4c165 | 2008-05-19 14:55:29 +1000 | [diff] [blame] | 3396 | - otto@cvs.openbsd.org 2008/04/29 11:20:31 |
| 3397 | [monitor_mm.h] |
| 3398 | garbage collect two unused fields in struct mm_master; ok markus@ |
Damien Miller | bacb7fb | 2008-05-19 14:56:33 +1000 | [diff] [blame] | 3399 | - djm@cvs.openbsd.org 2008/04/30 10:14:03 |
| 3400 | [ssh-keyscan.1 ssh-keyscan.c] |
| 3401 | default to rsa (protocol 2) keys, instead of rsa1 keys; spotted by |
| 3402 | larsnooden AT openoffice.org |
Damien Miller | 4f755cd | 2008-05-19 14:57:41 +1000 | [diff] [blame] | 3403 | - pyr@cvs.openbsd.org 2008/05/07 05:49:37 |
| 3404 | [servconf.c servconf.h session.c sshd_config.5] |
| 3405 | Enable the AllowAgentForwarding option in sshd_config (global and match |
| 3406 | context), to specify if agents should be permitted on the server. |
| 3407 | As the man page states: |
| 3408 | ``Note that disabling Agent forwarding does not improve security |
| 3409 | unless users are also denied shell access, as they can always install |
| 3410 | their own forwarders.'' |
| 3411 | ok djm@, ok and a mild frown markus@ |
Damien Miller | ba3a659 | 2008-05-19 14:58:22 +1000 | [diff] [blame] | 3412 | - pyr@cvs.openbsd.org 2008/05/07 06:43:35 |
| 3413 | [sshd_config] |
| 3414 | push the sshd_config bits in, spotted by ajacoutot@ |
Damien Miller | e989019 | 2008-05-19 14:59:02 +1000 | [diff] [blame] | 3415 | - jmc@cvs.openbsd.org 2008/05/07 08:00:14 |
| 3416 | [sshd_config.5] |
| 3417 | sort; |
Damien Miller | db255ca | 2008-05-19 14:59:37 +1000 | [diff] [blame] | 3418 | - markus@cvs.openbsd.org 2008/05/08 06:59:01 |
| 3419 | [bufaux.c buffer.h channels.c packet.c packet.h] |
| 3420 | avoid extra malloc/copy/free when receiving data over the net; |
| 3421 | ~10% speedup for localhost-scp; ok djm@ |
Damien Miller | b84886b | 2008-05-19 15:05:07 +1000 | [diff] [blame] | 3422 | - djm@cvs.openbsd.org 2008/05/08 12:02:23 |
| 3423 | [auth-options.c auth1.c channels.c channels.h clientloop.c gss-serv.c] |
| 3424 | [monitor.c monitor_wrap.c nchan.c servconf.c serverloop.c session.c] |
| 3425 | [ssh.c sshd.c] |
| 3426 | Implement a channel success/failure status confirmation callback |
| 3427 | mechanism. Each channel maintains a queue of callbacks, which will |
| 3428 | be drained in order (RFC4253 guarantees confirm messages are not |
| 3429 | reordered within an channel). |
| 3430 | Also includes a abandonment callback to clean up if a channel is |
| 3431 | closed without sending confirmation messages. This probably |
| 3432 | shouldn't happen in compliant implementations, but it could be |
| 3433 | abused to leak memory. |
| 3434 | ok markus@ (as part of a larger diff) |
Damien Miller | 7207f64 | 2008-05-19 15:34:50 +1000 | [diff] [blame] | 3435 | - djm@cvs.openbsd.org 2008/05/08 12:21:16 |
| 3436 | [monitor.c monitor_wrap.c session.h servconf.c servconf.h session.c] |
| 3437 | [sshd_config sshd_config.5] |
| 3438 | Make the maximum number of sessions run-time controllable via |
| 3439 | a sshd_config MaxSessions knob. This is useful for disabling |
| 3440 | login/shell/subsystem access while leaving port-forwarding working |
| 3441 | (MaxSessions 0), disabling connection multiplexing (MaxSessions 1) or |
| 3442 | simply increasing the number of allows multiplexed sessions. |
| 3443 | Because some bozos are sure to configure MaxSessions in excess of the |
| 3444 | number of available file descriptors in sshd (which, at peak, might be |
| 3445 | as many as 9*MaxSessions), audit sshd to ensure that it doesn't leak fds |
| 3446 | on error paths, and make it fail gracefully on out-of-fd conditions - |
| 3447 | sending channel errors instead of than exiting with fatal(). |
| 3448 | bz#1090; MaxSessions config bits and manpage from junyer AT gmail.com |
| 3449 | ok markus@ |
Damien Miller | 5771ed7 | 2008-05-19 15:35:33 +1000 | [diff] [blame] | 3450 | - djm@cvs.openbsd.org 2008/05/08 13:06:11 |
| 3451 | [clientloop.c clientloop.h ssh.c] |
| 3452 | Use new channel status confirmation callback system to properly deal |
| 3453 | with "important" channel requests that fail, in particular command exec, |
| 3454 | shell and subsystem requests. Previously we would optimistically assume |
| 3455 | that the requests would always succeed, which could cause hangs if they |
| 3456 | did not (e.g. when the server runs out of fds) or were unimplemented by |
| 3457 | the server (bz #1384) |
| 3458 | Also, properly report failing multiplex channel requests via the mux |
| 3459 | client stderr (subject to LogLevel in the mux master) - better than |
| 3460 | silently failing. |
| 3461 | most bits ok markus@ (as part of a larger diff) |
Damien Miller | bd74025 | 2008-05-19 15:37:09 +1000 | [diff] [blame] | 3462 | - djm@cvs.openbsd.org 2008/05/09 04:55:56 |
| 3463 | [channels.c channels.h clientloop.c serverloop.c] |
| 3464 | Try additional addresses when connecting to a port forward destination |
| 3465 | whose DNS name resolves to more than one address. The previous behaviour |
| 3466 | was to try the first address and give up. |
| 3467 | Reported by stig AT venaas.com in bz#343 |
| 3468 | great feedback and ok markus@ |
Damien Miller | b1cbfa2 | 2008-05-19 16:00:08 +1000 | [diff] [blame] | 3469 | - djm@cvs.openbsd.org 2008/05/09 14:18:44 |
| 3470 | [clientloop.c clientloop.h ssh.c mux.c] |
| 3471 | tidy up session multiplexing code, moving it into its own file and |
| 3472 | making the function names more consistent - making ssh.c and |
| 3473 | clientloop.c a fair bit more readable. |
| 3474 | ok markus@ |
Damien Miller | b3da593 | 2008-05-19 16:02:37 +1000 | [diff] [blame] | 3475 | - djm@cvs.openbsd.org 2008/05/09 14:26:08 |
| 3476 | [ssh.c] |
| 3477 | dingo stole my diff hunk |
Damien Miller | 2ff1ca5 | 2008-05-19 16:04:56 +1000 | [diff] [blame] | 3478 | - markus@cvs.openbsd.org 2008/05/09 16:16:06 |
| 3479 | [session.c] |
| 3480 | re-add the USE_PIPES code and enable it. |
| 3481 | without pipes shutdown-read from the sshd does not trigger |
| 3482 | a SIGPIPE when the forked program does a write. |
| 3483 | ok djm@ |
| 3484 | (Id sync only, USE_PIPES never left portable OpenSSH) |
Damien Miller | d654dd2 | 2008-05-19 16:05:41 +1000 | [diff] [blame] | 3485 | - markus@cvs.openbsd.org 2008/05/09 16:17:51 |
| 3486 | [channels.c] |
| 3487 | error-fd race: don't enable the error fd in the select bitmask |
| 3488 | for channels with both in- and output closed, since the channel |
| 3489 | will go away before we call select(); |
| 3490 | report, lots of debugging help and ok djm@ |
Damien Miller | bab9bd4 | 2008-05-19 16:06:47 +1000 | [diff] [blame] | 3491 | - markus@cvs.openbsd.org 2008/05/09 16:21:13 |
| 3492 | [channels.h clientloop.c nchan.c serverloop.c] |
| 3493 | unbreak |
| 3494 | ssh -2 localhost od /bin/ls | true |
| 3495 | ignoring SIGPIPE by adding a new channel message (EOW) that signals |
| 3496 | the peer that we're not interested in any data it might send. |
| 3497 | fixes bz #85; discussion, debugging and ok djm@ |
Damien Miller | 0f30c87 | 2008-05-19 16:07:45 +1000 | [diff] [blame] | 3498 | - pvalchev@cvs.openbsd.org 2008/05/12 20:52:20 |
| 3499 | [umac.c] |
| 3500 | Ensure nh_result lies on a 64-bit boundary (fixes warnings observed |
| 3501 | on Itanium on Linux); from Dale Talcott (bug #1462); ok djm@ |
Damien Miller | 5159bdd | 2008-05-19 16:08:20 +1000 | [diff] [blame] | 3502 | - djm@cvs.openbsd.org 2008/05/15 23:52:24 |
| 3503 | [nchan2.ms] |
| 3504 | document eow message in ssh protocol 2 channel state machine; |
| 3505 | feedback and ok markus@ |
Damien Miller | a7e0d5a | 2008-05-19 16:08:41 +1000 | [diff] [blame] | 3506 | - djm@cvs.openbsd.org 2008/05/18 21:29:05 |
| 3507 | [sftp-server.c] |
| 3508 | comment extension announcement |
Damien Miller | 58a8114 | 2008-05-19 16:11:56 +1000 | [diff] [blame] | 3509 | - djm@cvs.openbsd.org 2008/05/16 08:30:42 |
| 3510 | [PROTOCOL] |
| 3511 | document our protocol extensions and deviations; ok markus@ |
| 3512 | - djm@cvs.openbsd.org 2008/05/17 01:31:56 |
| 3513 | [PROTOCOL] |
| 3514 | grammar and correctness fixes from stevesk@ |
Damien Miller | 797e3d1 | 2008-05-19 14:27:42 +1000 | [diff] [blame] | 3515 | |
Damien Miller | 5f5cd74 | 2008-04-03 08:43:57 +1100 | [diff] [blame] | 3516 | 20080403 |
Damien Miller | 55754fb | 2008-04-04 16:16:35 +1100 | [diff] [blame] | 3517 | - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile- |
| 3518 | time warnings on LynxOS. Patch from ops AT iki.fi |
Damien Miller | c575022 | 2008-05-16 10:01:54 +1000 | [diff] [blame] | 3519 | - (djm) Force string arguments to replacement setproctitle() though |
| 3520 | strnvis first. Ok dtucker@ |
Damien Miller | 55754fb | 2008-04-04 16:16:35 +1100 | [diff] [blame] | 3521 | |
| 3522 | 20080403 |
Damien Miller | 5f5cd74 | 2008-04-03 08:43:57 +1100 | [diff] [blame] | 3523 | - (djm) OpenBSD CVS sync: |
| 3524 | - markus@cvs.openbsd.org 2008/04/02 15:36:51 |
| 3525 | [channels.c] |
| 3526 | avoid possible hijacking of x11-forwarded connections (back out 1.183) |
| 3527 | CVE-2008-1483; ok djm@ |
Damien Miller | 13ba9c2 | 2008-04-03 20:52:51 +1100 | [diff] [blame] | 3528 | - jmc@cvs.openbsd.org 2008/03/27 22:37:57 |
| 3529 | [sshd.8] |
| 3530 | remove trailing whitespace; |
Damien Miller | a68d31b | 2008-04-03 20:53:08 +1100 | [diff] [blame] | 3531 | - djm@cvs.openbsd.org 2008/04/03 09:50:14 |
| 3532 | [version.h] |
| 3533 | openssh-5.0 |
Damien Miller | 5a4b646 | 2008-04-03 20:55:44 +1100 | [diff] [blame] | 3534 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
| 3535 | [contrib/suse/openssh.spec] Crank version numbers in RPM spec files |
Damien Miller | ffa8302 | 2008-04-03 20:56:38 +1100 | [diff] [blame] | 3536 | - (djm) [README] Update link to release notes |
Damien Miller | 79a1bc9 | 2008-04-03 20:57:05 +1100 | [diff] [blame] | 3537 | - (djm) Release 5.0p1 |