- Remove references to SSLeay.

 - Big OpenBSD CVS update
  - markus@cvs.openbsd.org
    [clientloop.c]
    - typo
    [session.c]
    - update proctitle on pty alloc/dealloc, e.g. w/ windows client
    [session.c]
    - update proctitle for proto 1, too
    [channels.h nchan.c serverloop.c session.c sshd.c]
    - use c-style comments
  - deraadt@cvs.openbsd.org
    [scp.c]
    - more atomicio
  - markus@cvs.openbsd.org
    [channels.c]
    - set O_NONBLOCK
    [ssh.1]
    - update AUTHOR
    [readconf.c ssh-keygen.c ssh.h]
    - default DSA key file ~/.ssh/id_dsa
    [clientloop.c]
    - typo, rm verbose debug
  - deraadt@cvs.openbsd.org
    [ssh-keygen.1]
    - document DSA use of ssh-keygen
    [sshd.8]
    - a start at describing what i understand of the DSA side
    [ssh-keygen.1]
    - document -X and -x
    [ssh-keygen.c]
    - simplify usage
  - markus@cvs.openbsd.org
    [sshd.8]
    - there is no rhosts_dsa
    [ssh-keygen.1]
    - document -y, update -X,-x
    [nchan.c]
    - fix close for non-open ssh1 channels
    [servconf.c servconf.h ssh.h sshd.8 sshd.c ]
    - s/DsaKey/HostDSAKey/, document option
    [sshconnect2.c]
    - respect number_of_password_prompts
    [channels.c channels.h servconf.c servconf.h session.c sshd.8]
    - GatewayPorts for sshd, ok deraadt@
    [ssh-add.1 ssh-agent.1 ssh.1]
    - more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
    [ssh.1]
    - more info on proto 2
    [sshd.8]
    - sync AUTHOR w/ ssh.1
    [key.c key.h sshconnect.c]
    - print key type when talking about host keys
    [packet.c]
    - clear padding in ssh2
    [dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
    - replace broken uuencode w/ libc b64_ntop
    [auth2.c]
    - log failure before sending the reply
    [key.c radix.c uuencode.c]
    - remote trailing comments before calling __b64_pton
    [auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
    [sshconnect2.c sshd.8]
    - add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
 - Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])

1 files changed, 9 insertions, 4 deletions

diff --git a/packet.c b/packet.c
index e70d06091..dfe21fa1c 100644
--- a/packet.c
+++ b/packet.c
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: packet.c,v 1.21 2000/05/01 11:10:33 damien Exp $");
+RCSID("$Id: packet.c,v 1.22 2000/05/07 02:03:17 damien Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -465,7 +465,7 @@ packet_send1()
         /* Compute packet length without padding (add checksum, remove padding). */
         len = buffer_len(&outgoing_packet) + 4 - 8;
 
-        /* Insert padding. */
+        /* Insert padding. Initialized to zero in packet_start1() */
         padding = 8 - len % 8;
         if (cipher_type != SSH_CIPHER_NONE) {
                 cp = buffer_ptr(&outgoing_packet);
@@ -569,12 +569,16 @@ packet_send2()
                 padlen += block_size;
         buffer_append_space(&outgoing_packet, &cp, padlen);
         if (enc && enc->type != SSH_CIPHER_NONE) {
+                /* random padding */
                 for (i = 0; i < padlen; i++) {
                         if (i % 4 == 0)
                                 rand = arc4random();
                         cp[i] = rand & 0xff;
                         rand <<= 8;
                 }
+        } else {
+                /* clear padding */
+                memset(cp, 0, padlen);
         }
         /* packet_length includes payload, padding and padding length field */
         packet_length = buffer_len(&outgoing_packet) - 4;
@@ -657,10 +661,11 @@ packet_read(int *payload_len_ptr)
         for (;;) {
                 /* Try to read a packet from the buffer. */
                 type = packet_read_poll(payload_len_ptr);
-                if (type == SSH_SMSG_SUCCESS
+                if (!use_ssh2_packet_format && (
+                    type == SSH_SMSG_SUCCESS
                     || type == SSH_SMSG_FAILURE
                     || type == SSH_CMSG_EOF
-                    || type == SSH_CMSG_EXIT_CONFIRMATION)
+                    || type == SSH_CMSG_EXIT_CONFIRMATION))
                         packet_integrity_check(*payload_len_ptr, 0, type);
                 /* If we got a packet, return it. */
                 if (type != SSH_MSG_NONE)