[Midnightbsd-cvs] src: crypto/openssh: Update for 5.0p1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Apr 17 20:20:45 EDT 2008
Log Message:
-----------
Update for 5.0p1
Modified Files:
--------------
src/crypto/openssh:
ChangeLog (r1.4 -> r1.5)
README (r1.4 -> r1.5)
channels.c (r1.5 -> r1.6)
ssh_config (r1.6 -> r1.7)
sshd.8 (r1.4 -> r1.5)
version.h (r1.10 -> r1.11)
Removed Files:
-------------
src/crypto/openssh:
typescript
-------------- next part --------------
Index: sshd.8
===================================================================
RCS file: /home/cvs/src/crypto/openssh/sshd.8,v
retrieving revision 1.4
retrieving revision 1.5
diff -L crypto/openssh/sshd.8 -L crypto/openssh/sshd.8 -u -r1.4 -r1.5
--- crypto/openssh/sshd.8
+++ crypto/openssh/sshd.8
@@ -34,8 +34,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd.8,v 1.240 2008/03/26 21:28:14 djm Exp $
-.Dd $Mdocdate: March 27 2008 $
+.\" $OpenBSD: sshd.8,v 1.241 2008/03/27 22:37:57 jmc Exp $
+.Dd $Mdocdate: April 3 2008 $
.Dt SSHD 8
.Os
.Sh NAME
@@ -532,7 +532,7 @@
.It Cm no-pty
Prevents tty allocation (a request to allocate a pty will fail).
.It Cm no-user-rc
-Disables execution of
+Disables execution of
.Pa ~/.ssh/rc .
.It Cm no-X11-forwarding
Forbids X11 forwarding when this key is used for authentication.
Index: ssh_config
===================================================================
RCS file: /home/cvs/src/crypto/openssh/ssh_config,v
retrieving revision 1.6
retrieving revision 1.7
diff -L crypto/openssh/ssh_config -L crypto/openssh/ssh_config -u -r1.6 -r1.7
--- crypto/openssh/ssh_config
+++ crypto/openssh/ssh_config
@@ -44,4 +44,4 @@
# Tunnel no
# TunnelDevice any:any
# PermitLocalCommand no
-# VersionAddendum MidnightBSD-20080406
+# VersionAddendum MidnightBSD-20080417
--- crypto/openssh/typescript
+++ /dev/null
@@ -1,84 +0,0 @@
-Script started on Sun Apr 6 00:37:52 2008
-defiant# ls
-CREDITS crc32.c readpass.c
-ChangeLog crc32.h regress
-INSTALL deattack.c rijndael.c
-LICENCE deattack.h rijndael.h
-Makefile.in defines.h rsa.c
-OVERVIEW dh.c rsa.h
-README dh.h scard
-README.dns dispatch.c scard-opensc.c
-README.platform dispatch.h scard.c
-README.privsep dns.c scard.h
-README.smartcard dns.h scp.1
-README.tun entropy.c scp.c
-RFC.nroff entropy.h servconf.c
-TODO fatal.c servconf.h
-WARNING.RNG fixpaths serverloop.c
-aclocal.m4 fixprogs serverloop.h
-acss.c groupaccess.c session.c
-acss.h groupaccess.h session.h
-atomicio.c gss-genr.c sftp-client.c
-atomicio.h gss-serv-krb5.c sftp-client.h
-audit-bsm.c gss-serv.c sftp-common.c
-audit.c hostfile.c sftp-common.h
-audit.h hostfile.h sftp-glob.c
-auth-bsdauth.c includes.h sftp-server-main.c
-auth-chall.c install-sh sftp-server.8
-auth-krb5.c kex.c sftp-server.c
-auth-options.c kex.h sftp.1
-auth-options.h kexdh.c sftp.c
-auth-pam.c kexdhc.c sftp.h
-auth-pam.h kexdhs.c ssh-add.1
-auth-passwd.c kexgex.c ssh-add.c
-auth-rh-rsa.c kexgexc.c ssh-agent.1
-auth-rhosts.c kexgexs.c ssh-agent.c
-auth-rsa.c key.c ssh-dss.c
-auth-shadow.c key.h ssh-gss.h
-auth-sia.c log.c ssh-keygen.1
-auth-sia.h log.h ssh-keygen.c
-auth-skey.c loginrec.c ssh-keyscan.1
-auth.c loginrec.h ssh-keyscan.c
-auth.h logintest.c ssh-keysign.8
-auth1.c mac.c ssh-keysign.c
-auth2-chall.c mac.h ssh-rand-helper.8
-auth2-gss.c match.c ssh-rand-helper.c
-auth2-hostbased.c match.h ssh-rsa.c
-auth2-kbdint.c md-sha256.c ssh.1
-auth2-none.c md5crypt.c ssh.c
-auth2-passwd.c md5crypt.h ssh.h
-auth2-pubkey.c mdoc2man.awk ssh1.h
-auth2.c misc.c ssh2.h
-authfd.c misc.h ssh_config
-authfd.h mkinstalldirs ssh_config.5
-authfile.c moduli ssh_prng_cmds.in
-authfile.h moduli.c sshconnect.c
-bufaux.c monitor.c sshconnect.h
-bufbn.c monitor.h sshconnect1.c
-buffer.c monitor_fdpass.c sshconnect2.c
-buffer.h monitor_fdpass.h sshd.8
-buildpkg.sh.in monitor_mm.c sshd.c
-canohost.c monitor_mm.h sshd_config
-canohost.h monitor_wrap.c sshd_config.5
-channels.c monitor_wrap.h sshlogin.c
-channels.h msg.c sshlogin.h
-cipher-3des1.c msg.h sshpty.c
-cipher-acss.c myproposal.h sshpty.h
-cipher-aes.c nchan.c sshtty.c
-cipher-bf1.c nchan.ms survey.sh.in
-cipher-ctr.c nchan2.ms ttymodes.c
-cipher.c openbsd-compat ttymodes.h
-cipher.h openssh.xml.in typescript
-cleanup.c opensshd.init.in uidswap.c
-clientloop.c packet.c uidswap.h
-clientloop.h packet.h umac.c
-compat.c pathnames.h umac.h
-compat.h platform.c uuencode.c
-compress.c platform.h uuencode.h
-compress.h progressmeter.c version.h
-config.guess progressmeter.h xmalloc.c
-config.sub readconf.c xmalloc.h
-configure.ac readconf.h
-defiant# cvs imprt [K[K[Ko[Kport src/crypto/openssh OPENSSH OpenSSH_4_0[K9p1
-laffer1 at stargazer's password:
-(B)0[1;24r[m[4l[?1h=[H[2JCVS: ----------------------------------------------------------------------
[1BCVS: Enter Log. Lines beginning with `CVS:' are removed automatically
[1BCVS:
[1BCVS: ----------------------------------------------------------------------
[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[1B~[H[23B/tmp/cvsdxqWgb: unmodified: line 1[H[23B[K[H[1;23r[1;1HM[1;24r[2;1H[22BCopying file for recovery...
[K[2;1H[AImport virgin OpenSSH 4.9p1
[23B:wq
\ No newline at end of file
Index: channels.c
===================================================================
RCS file: /home/cvs/src/crypto/openssh/channels.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -L crypto/openssh/channels.c -L crypto/openssh/channels.c -u -r1.5 -r1.6
--- crypto/openssh/channels.c
+++ crypto/openssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.272 2008/01/19 23:02:40 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.273 2008/04/02 21:36:51 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -2906,9 +2906,6 @@
debug2("bind port %d: %.100s", port, strerror(errno));
close(sock);
- if (ai->ai_next)
- continue;
-
for (n = 0; n < num_socks; n++) {
close(socks[n]);
}
Index: ChangeLog
===================================================================
RCS file: /home/cvs/src/crypto/openssh/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -L crypto/openssh/ChangeLog -L crypto/openssh/ChangeLog -u -r1.4 -r1.5
--- crypto/openssh/ChangeLog
+++ crypto/openssh/ChangeLog
@@ -1,3 +1,29 @@
+20080403
+ - (djm) OpenBSD CVS sync:
+ - markus at cvs.openbsd.org 2008/04/02 15:36:51
+ [channels.c]
+ avoid possible hijacking of x11-forwarded connections (back out 1.183)
+ CVE-2008-1483; ok djm@
+ - jmc at cvs.openbsd.org 2008/03/27 22:37:57
+ [sshd.8]
+ remove trailing whitespace;
+ - djm at cvs.openbsd.org 2008/04/03 09:50:14
+ [version.h]
+ openssh-5.0
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+ [contrib/suse/openssh.spec] Crank version numbers in RPM spec files
+ - (djm) [README] Update link to release notes
+ - (djm) Release 5.0p1
+
+20080315
+ - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
+ empty; report and patch from Peter Stuge
+ - (djm) [regress/test-exec.sh] Silence noise from detection of putty
+ commands; report from Peter Stuge
+ - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
+ crashes when used with ChrootDirectory
+
+
20080327
- (dtucker) Cache selinux status earlier so we know if it's enabled after a
chroot. Allows ChrootDirectory to work with selinux support compiled in
@@ -3825,4 +3851,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4896.2.1 2008/03/27 06:53:20 djm Exp $
+$Id: ChangeLog,v 1.4903 2008/04/03 09:57:05 djm Exp $
Index: version.h
===================================================================
RCS file: /home/cvs/src/crypto/openssh/version.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -L crypto/openssh/version.h -L crypto/openssh/version.h -u -r1.10 -r1.11
--- crypto/openssh/version.h
+++ crypto/openssh/version.h
@@ -1,12 +1,12 @@
/* $MidnightBSD$ */
-/* $OpenBSD: version.h,v 1.52 2008/03/27 00:16:49 djm Exp $ */
+/* $OpenBSD: version.h,v 1.53 2008/04/03 09:50:14 djm Exp $ */
#ifndef SSH_VERSION
#define SSH_VERSION (ssh_version_get())
#define SSH_RELEASE (ssh_version_get())
-#define SSH_VERSION_BASE "OpenSSH_4.9p1"
-#define SSH_VERSION_ADDENDUM "MidnightBSD-20080406"
+#define SSH_VERSION_BASE "OpenSSH_5.0p1"
+#define SSH_VERSION_ADDENDUM "MidnightBSD-20080417"
const char *ssh_version_get(void);
void ssh_version_set_addendum(const char *add);
Index: README
===================================================================
RCS file: /home/cvs/src/crypto/openssh/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -L crypto/openssh/README -L crypto/openssh/README -u -r1.4 -r1.5
--- crypto/openssh/README
+++ crypto/openssh/README
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-4.9 for the release notes.
+See http://www.openssh.com/txt/release-5.0 for the release notes.
- A Japanese translation of this document and of the OpenSSH FAQ is
- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@
[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
[7] http://www.openssh.com/faq.html
-$Id: README,v 1.67 2008/03/27 06:43:34 djm Exp $
+$Id: README,v 1.68 2008/04/03 09:56:38 djm Exp $
More information about the Midnightbsd-cvs
mailing list