mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-14 21:47:19 +02:00
* misc.c (compress_algo_to_string, check_compress_algo): Add bzip2.
* g10.c (main): Add read-only warning. * compress.c (compress_filter): Make static to help force the use of push_compress_filter. Remove default algorithm setting since that is done in push_compress_filter now. * main.h: Use named algorithm. * filter.h, compress.c (push_compress_filter, push_compress_filter2): New. Figure out which is the appropriate compression filter to use, and push it into place. * compress.c (handle_compressed), encode.c (encode_simple, encode_crypt), sign.c (sign_file, sign_symencrypt_file), import.c (read_block), export.c (do_export): Use push_compress_filter instead of pushing the compression filter ourselves. * compress-bz2.c: New. Bzlib versions of the compression filter routines. * Makefile.am: Include compress-bz2.c if bz2lib is available.
This commit is contained in:
parent
5c8f990e85
commit
ef3f432bc5
12 changed files with 360 additions and 47 deletions
|
@ -1920,6 +1920,11 @@ main( int argc, char **argv )
|
|||
if( check_digest_algo(opt.s2k_digest_algo) )
|
||||
log_error(_("selected digest algorithm is invalid\n"));
|
||||
}
|
||||
#ifdef HAVE_BZIP2
|
||||
if(opt.def_compress_algo==3)
|
||||
log_info(_("compress algorithm `%s' is read-only in this release\n"),
|
||||
"BZIP2");
|
||||
#endif
|
||||
if( opt.def_compress_algo < -1 || opt.def_compress_algo > 2 )
|
||||
log_error(_("compress algorithm must be in range %d..%d\n"), 0, 2);
|
||||
if( opt.completes_needed < 1 )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue