diff options
| author | Damien Miller <djm@mindrot.org> | 2000-05-08 13:44:52 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-05-08 13:44:52 +1000 |
| commit | 6d48871fafed89fe878f44744a1abc0f5a47afb4 (patch) | |
| tree | 811dee8ddd57787d408b50490c7dad14b58f0802 | |
| parent | 58e579bcd987397aeeb5f0a7935ffdfa67125f37 (diff) | |
- OpenBSD CVS updateV_2_0_0_BETA2
- markus@cvs.openbsd.org
[clientloop.c sshconnect2.c]
- make x11-fwd interop w/ ssh-2.0.13
[README.openssh2]
- interop w/ SecureFX
- Release 2.0.0beta2
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | README.openssh2 | 6 | ||||
| -rw-r--r-- | clientloop.c | 9 | ||||
| -rw-r--r-- | sshconnect2.c | 4 |
4 files changed, 19 insertions, 7 deletions
@@ -1,6 +1,13 @@ 20000508 - Makefile and RPM spec fixes - Generate DSA host keys during "make key" or RPM installs + - OpenBSD CVS update + - markus@cvs.openbsd.org + [clientloop.c sshconnect2.c] + - make x11-fwd interop w/ ssh-2.0.13 + [README.openssh2] + - interop w/ SecureFX + - Release 2.0.0beta2 20000507 - Remove references to SSLeay. diff --git a/README.openssh2 b/README.openssh2 index 36d3de6e..12c90aa3 100644 --- a/README.openssh2 +++ b/README.openssh2 @@ -1,4 +1,4 @@ -$Id: README.openssh2,v 1.4 2000/04/29 13:57:09 damien Exp $ +$Id: README.openssh2,v 1.8 2000/05/07 18:30:03 markus Exp $ howto: 1) generate server key: @@ -25,7 +25,7 @@ works: x11-fwd dss/dsa: host key database in ~/.ssh/known_hosts2 client interops w/ sshd2, lshd - server interops w/ ssh2, lsh, ssh.com's Windows client, SecureCRT, F-Secure SSH Client 4.0 + server interops w/ ssh2, lsh, ssh.com's Windows client, SecureCRT, F-Secure SSH Client 4.0, SecureFX (secure ftp) server supports multiple concurrent sessions (e.g. with SSH.com Windows client) todo: re-keying @@ -41,4 +41,4 @@ todo: sftp -markus -$Date: 2000/04/29 13:57:09 $ +$Date: 2000/05/07 18:30:03 $ diff --git a/clientloop.c b/clientloop.c index 382cfe1f..e34f5cda 100644 --- a/clientloop.c +++ b/clientloop.c @@ -16,7 +16,7 @@ */ #include "includes.h" -RCSID("$Id: clientloop.c,v 1.14 2000/05/07 02:03:16 damien Exp $"); +RCSID("$Id: clientloop.c,v 1.15 2000/05/08 03:44:53 damien Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -979,7 +979,12 @@ client_input_channel_open(int type, int plen) char *originator; int originator_port; originator = packet_get_string(NULL); - originator_port = packet_get_int(); + if (packet_remaining() > 0) { + originator_port = packet_get_int(); + } else { + debug("buggy server: x11 request w/o originator_port"); + originator_port = 0; + } packet_done(); /* XXX check permission */ xfree(originator); diff --git a/sshconnect2.c b/sshconnect2.c index 17325b09..3bddd7cc 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -28,7 +28,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.7 2000/05/06 17:45:37 markus Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.8 2000/05/07 18:23:32 markus Exp $"); #include <openssl/bn.h> #include <openssl/rsa.h> @@ -405,7 +405,7 @@ ssh_userauth2(const char *server_user, char *host) xfree(reply); } else { /* payload empty for ssh-2.0.13 ?? */ - log("buggy server: service_accept w/o service"); + debug("buggy server: service_accept w/o service"); } packet_done(); debug("got SSH2_MSG_SERVICE_ACCEPT"); |