diff options
| author | David Shaw <[email protected]> | 2003-11-15 15:38:43 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-11-15 15:38:43 +0000 |
| commit | 3257edd4e47727bf8660dba3f8031fc17395c9ea (patch) | |
| tree | 02bfd8ffd9cd937e05e173c1b200a750c7de5809 /g10/encode.c | |
| parent | * options.h, trustdb.c (trust_model_string, init_trustdb): Add support for (diff) | |
| download | gnupg-3257edd4e47727bf8660dba3f8031fc17395c9ea.tar.gz gnupg-3257edd4e47727bf8660dba3f8031fc17395c9ea.zip | |
* encode.c (encode_simple), sign.c (sign_symencrypt_file): Properly use
default_compress_algo (--compress-algo, followed by the highest
--personal-compress-preference, followed by ZIP) to get the algorithm.
Diffstat (limited to '')
| -rw-r--r-- | g10/encode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/encode.c b/g10/encode.c index b291ecefd..b6a776d4a 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -161,7 +161,7 @@ encode_simple( const char *filename, int mode, int use_seskey ) compress_filter_context_t zfx; text_filter_context_t tfx; progress_filter_context_t pfx; - int do_compress = opt.compress && !RFC1991; + int do_compress = !RFC1991 && default_compress_algo(); memset( &cfx, 0, sizeof cfx); memset( &afx, 0, sizeof afx); @@ -332,7 +332,7 @@ encode_simple( const char *filename, int mode, int use_seskey ) { if (cfx.dek && cfx.dek->use_mdc) zfx.new_ctb = 1; - push_compress_filter(out,&zfx,opt.def_compress_algo); + push_compress_filter(out,&zfx,default_compress_algo()); } /* do the work */ |