From 5dfd5a6dac4d1e5fa5857f68f79dfea7f77bf526 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 30 Aug 2002 16:34:13 +0000 Subject: * pkclist.c (do_we_trust_pre): Changed the wording of a warning. * encode.c (encode_simple,encode_crypt): Use new style CTB for compressssed packets when using MDC. We need to do this so that concatenated messages are properly decrypted. Old style compression assumes that it is the last packet; given that we can't determine the length in advance, the uncompressor does not know where to start. Actually we should use the new CTB always but this would break PGP 2 compatibility. * parse-packet.c (parse): Special treatment for new style CTB compressed packets. * build-packet.c (do_mdc): Removed. Was not used. (do_encrypted_mdc): Count the version number and the MDC packet. --- g10/compress.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'g10/compress.c') diff --git a/g10/compress.c b/g10/compress.c index 6d85e0181..6ea84f6cd 100644 --- a/g10/compress.c +++ b/g10/compress.c @@ -171,11 +171,11 @@ do_uncompress( compress_filter_context_t *zfx, z_stream *zs, if( DBG_FILTER ) log_debug("enter inflate: avail_in=%u, avail_out=%u\n", (unsigned)zs->avail_in, (unsigned)zs->avail_out); - #ifdef Z_SYNC_FLUSH +#ifdef Z_SYNC_FLUSH zrc = inflate( zs, Z_SYNC_FLUSH ); - #else +#else zrc = inflate( zs, Z_PARTIAL_FLUSH ); - #endif +#endif if( DBG_FILTER ) log_debug("leave inflate: avail_in=%u, avail_out=%u, zrc=%d\n", (unsigned)zs->avail_in, (unsigned)zs->avail_out, zrc); -- cgit