security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-22 14:57:02 +01:00
Code Activity

* encode.c (encode_simple), sign.c (sign_symencrypt_file): Properly use

Browse Source 
default_compress_algo (--compress-algo, followed by the highest
--personal-compress-preference, followed by ZIP) to get the algorithm.
This commit is contained in:
David Shaw 2003-11-15 15:38:43 +00:00
parent c47ec46526
commit 3257edd4e4
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2003-11-15 David Shaw <dshaw@jabberwocky.com>
* 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 <dshaw@jabberwocky.com> 2003-11-14 David Shaw <dshaw@jabberwocky.com>
* options.h, trustdb.c (trust_model_string, init_trustdb): Add * options.h, trustdb.c (trust_model_string, init_trustdb): Add

4
g10/encode.c
View File

@ -161,7 +161,7 @@ encode_simple( const char *filename, int mode, int use_seskey )
compress_filter_context_t zfx; compress_filter_context_t zfx;
text_filter_context_t tfx; text_filter_context_t tfx;
progress_filter_context_t pfx; progress_filter_context_t pfx;
int do_compress = opt.compress && !RFC1991; int do_compress = !RFC1991 && default_compress_algo();
memset( &cfx, 0, sizeof cfx); memset( &cfx, 0, sizeof cfx);
memset( &afx, 0, sizeof afx); 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) if (cfx.dek && cfx.dek->use_mdc)
zfx.new_ctb = 1; zfx.new_ctb = 1;
push_compress_filter(out,&zfx,opt.def_compress_algo); push_compress_filter(out,&zfx,default_compress_algo());
} }
/* do the work */ /* do the work */

2
g10/sign.c
View File

@ -1182,7 +1182,7 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
/* Push the Zip filter */ /* Push the Zip filter */
if (opt.compress && default_compress_algo()) 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 */ /* Write the one-pass signature packets */
/*(current filters: zip - encrypt - armor)*/ /*(current filters: zip - encrypt - armor)*/