diff options
| author | Werner Koch <[email protected]> | 2002-08-30 16:34:13 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-08-30 16:34:13 +0000 |
| commit | 5dfd5a6dac4d1e5fa5857f68f79dfea7f77bf526 (patch) | |
| tree | 63791e9a52eddbadff543c0bb6704e5e09b51cf7 /g10/compress.c | |
| parent | * random.c: Automagically detect the entrop gatherer when (diff) | |
| download | gnupg-5dfd5a6dac4d1e5fa5857f68f79dfea7f77bf526.tar.gz gnupg-5dfd5a6dac4d1e5fa5857f68f79dfea7f77bf526.zip | |
* 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.
Diffstat (limited to 'g10/compress.c')
| -rw-r--r-- | g10/compress.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |