mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-01-31 14:11:35 +00:00
226cfa0378
Linux and works. So that is at least a good sign. =) 20010122 - (bal) OpenBSD Resync - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus [servconf.c ssh.h sshd.c] only auth-chall.c needs #ifdef SKEY - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c packet.c pathname.h readconf.c scp.c servconf.c serverloop.c session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h ssh1.h sshconnect1.c sshd.c ttymodes.c] move ssh1 definitions to ssh1.h, pathnames to pathnames.h - markus@cvs.openbsd.org 2001/01/19 16:48:14 [sshd.8] fix typo; from stevesk@ - markus@cvs.openbsd.org 2001/01/19 16:50:58 [ssh-dss.c] clear and free digest, make consistent with other code (use dlen); from stevesk@ - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus [auth-options.c auth-options.h auth-rsa.c auth2.c] pass the filename to auth_parse_options() - markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001 [readconf.c] fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com - stevesk@cvs.openbsd.org 2001/01/20 18:20:29 [sshconnect2.c] dh_new_group() does not return NULL. ok markus@ - markus@cvs.openbsd.org 2001/01/20 21:33:42 [ssh-add.c] do not loop forever if askpass does not exist; from andrew@pimlott.ne.mediaone.net - djm@cvs.openbsd.org 2001/01/20 23:00:56 [servconf.c] Check for NULL return from strdelim; ok markus - djm@cvs.openbsd.org 2001/01/20 23:02:07 [readconf.c] KNF; ok markus - jakob@cvs.openbsd.org 2001/01/21 9:00:33 [ssh-keygen.1] remove -R flag; ok markus@ - markus@cvs.openbsd.org 2001/01/21 19:05:40 [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c cipher.c cli.c clientloop.c clientloop.h compat.c compress.c deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c key.c key.h log-client.c log-server.c log.c log.h login.c login.h match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h ttysmodes.c uidswap.c xmalloc.c] split ssh.h and try to cleanup the #include mess. remove unnecessary #includes. rename util.[ch] -> misc.[ch] - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve conflict when compiling for non-kerb install - (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes on 1/19.
142 lines
4.4 KiB
C
142 lines
4.4 KiB
C
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
* All rights reserved
|
|
* Interface to packet compression for ssh.
|
|
*
|
|
* As far as I am concerned, the code I have written for this software
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
* software must be clearly marked as such, and if the derived work is
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
*/
|
|
|
|
#include "includes.h"
|
|
RCSID("$OpenBSD: compress.c,v 1.12 2001/01/21 19:05:48 markus Exp $");
|
|
|
|
#include "log.h"
|
|
#include "buffer.h"
|
|
#include "zlib.h"
|
|
|
|
static z_stream incoming_stream;
|
|
static z_stream outgoing_stream;
|
|
|
|
/*
|
|
* Initializes compression; level is compression level from 1 to 9
|
|
* (as in gzip).
|
|
*/
|
|
|
|
void
|
|
buffer_compress_init(int level)
|
|
{
|
|
debug("Enabling compression at level %d.", level);
|
|
if (level < 1 || level > 9)
|
|
fatal("Bad compression level %d.", level);
|
|
inflateInit(&incoming_stream);
|
|
deflateInit(&outgoing_stream, level);
|
|
}
|
|
|
|
/* Frees any data structures allocated for compression. */
|
|
|
|
void
|
|
buffer_compress_uninit(void)
|
|
{
|
|
debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
|
|
outgoing_stream.total_in, outgoing_stream.total_out,
|
|
outgoing_stream.total_in == 0 ? 0.0 :
|
|
(double) outgoing_stream.total_out / outgoing_stream.total_in);
|
|
debug("compress incoming: raw data %lu, compressed %lu, factor %.2f",
|
|
incoming_stream.total_out, incoming_stream.total_in,
|
|
incoming_stream.total_out == 0 ? 0.0 :
|
|
(double) incoming_stream.total_in / incoming_stream.total_out);
|
|
inflateEnd(&incoming_stream);
|
|
deflateEnd(&outgoing_stream);
|
|
}
|
|
|
|
/*
|
|
* Compresses the contents of input_buffer into output_buffer. All packets
|
|
* compressed using this function will form a single compressed data stream;
|
|
* however, data will be flushed at the end of every call so that each
|
|
* output_buffer can be decompressed independently (but in the appropriate
|
|
* order since they together form a single compression stream) by the
|
|
* receiver. This appends the compressed data to the output buffer.
|
|
*/
|
|
|
|
void
|
|
buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
|
|
{
|
|
char buf[4096];
|
|
int status;
|
|
|
|
/* This case is not handled below. */
|
|
if (buffer_len(input_buffer) == 0)
|
|
return;
|
|
|
|
/* Input is the contents of the input buffer. */
|
|
outgoing_stream.next_in = (u_char *) buffer_ptr(input_buffer);
|
|
outgoing_stream.avail_in = buffer_len(input_buffer);
|
|
|
|
/* Loop compressing until deflate() returns with avail_out != 0. */
|
|
do {
|
|
/* Set up fixed-size output buffer. */
|
|
outgoing_stream.next_out = (u_char *)buf;
|
|
outgoing_stream.avail_out = sizeof(buf);
|
|
|
|
/* Compress as much data into the buffer as possible. */
|
|
status = deflate(&outgoing_stream, Z_PARTIAL_FLUSH);
|
|
switch (status) {
|
|
case Z_OK:
|
|
/* Append compressed data to output_buffer. */
|
|
buffer_append(output_buffer, buf,
|
|
sizeof(buf) - outgoing_stream.avail_out);
|
|
break;
|
|
default:
|
|
fatal("buffer_compress: deflate returned %d", status);
|
|
/* NOTREACHED */
|
|
}
|
|
} while (outgoing_stream.avail_out == 0);
|
|
}
|
|
|
|
/*
|
|
* Uncompresses the contents of input_buffer into output_buffer. All packets
|
|
* uncompressed using this function will form a single compressed data
|
|
* stream; however, data will be flushed at the end of every call so that
|
|
* each output_buffer. This must be called for the same size units that the
|
|
* buffer_compress was called, and in the same order that buffers compressed
|
|
* with that. This appends the uncompressed data to the output buffer.
|
|
*/
|
|
|
|
void
|
|
buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
|
|
{
|
|
char buf[4096];
|
|
int status;
|
|
|
|
incoming_stream.next_in = (u_char *) buffer_ptr(input_buffer);
|
|
incoming_stream.avail_in = buffer_len(input_buffer);
|
|
|
|
for (;;) {
|
|
/* Set up fixed-size output buffer. */
|
|
incoming_stream.next_out = (u_char *) buf;
|
|
incoming_stream.avail_out = sizeof(buf);
|
|
|
|
status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);
|
|
switch (status) {
|
|
case Z_OK:
|
|
buffer_append(output_buffer, buf,
|
|
sizeof(buf) - incoming_stream.avail_out);
|
|
break;
|
|
case Z_BUF_ERROR:
|
|
/*
|
|
* Comments in zlib.h say that we should keep calling
|
|
* inflate() until we get an error. This appears to
|
|
* be the error that we get.
|
|
*/
|
|
return;
|
|
default:
|
|
fatal("buffer_uncompress: inflate returned %d", status);
|
|
/* NOTREACHED */
|
|
}
|
|
}
|
|
}
|