diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/encode.c | 4 | ||||
| -rw-r--r-- | g10/sign.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index fc6267992..c0518ad65 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2003-11-15 David Shaw <[email protected]> + + * 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. + 2003-11-14 David Shaw <[email protected]> * options.h, trustdb.c (trust_model_string, init_trustdb): Add 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 */ diff --git a/g10/sign.c b/g10/sign.c index e595ce9b1..17c1d2614 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -1182,7 +1182,7 @@ sign_symencrypt_file (const char *fname, STRLIST locusr) /* Push the Zip filter */ if (opt.compress && default_compress_algo()) - push_compress_filter(out,&zfx,opt.def_compress_algo); + push_compress_filter(out,&zfx,default_compress_algo()); /* Write the one-pass signature packets */ /*(current filters: zip - encrypt - armor)*/ |