mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
c47ec46526
commit
3257edd4e4
3 changed files with 10 additions and 3 deletions
|
@ -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 */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue