diff options
| author | Werner Koch <[email protected]> | 2023-01-18 17:04:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-01-19 09:45:54 +0000 |
| commit | 60963d98cfd8e60f88ee43c2d992f6dd3bbbd74c (patch) | |
| tree | 766f37c0531a72f5d11e3920b87ba2e51ce23b46 /common/util.h | |
| parent | common: Replace all assert by log_assert. (diff) | |
| download | gnupg-60963d98cfd8e60f88ee43c2d992f6dd3bbbd74c.tar.gz gnupg-60963d98cfd8e60f88ee43c2d992f6dd3bbbd74c.zip | |
gpg: Detect already compressed data also when using a pipe.
* common/iobuf.c (file_filter_ctx_t): Add fields for the peek feature.
(file_filter): Implement peeking.
(iobuf_ioctl): Add new IOBUF_IOCTL_PEEK.
* common/iobuf.h (IOBUF_IOCTL_PEEK, IOBUFCTRL_PEEK): New.
* common/miscellaneous.c (is_file_compressed): Rewrite. Detect PDF.
* g10/encrypt.c (encrypt_simple): Peek before detecting compression.
(encrypt_crypt): Ditto.
* g10/sign.c (sign_file): Also detect already compressed data.
* g10/options.h (opt): Add explicit_compress_option.
* g10/gpg.c (main): Set opt.explicit_compress_option for -z.
--
Note that this patch also introduces a compression check for signing
which was never done in the past.
GnuPG-bug-id: 6332
Diffstat (limited to 'common/util.h')
| -rw-r--r-- | common/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/util.h b/common/util.h index 6978ab896..d80e4fb25 100644 --- a/common/util.h +++ b/common/util.h @@ -359,7 +359,7 @@ char *try_make_printable_string (const void *p, size_t n, int delim); char *make_printable_string (const void *p, size_t n, int delim); char *decode_c_string (const char *src); -int is_file_compressed (const char *s, int *ret_rc); +int is_file_compressed (const byte *buf, unsigned int buflen); int match_multistr (const char *multistr,const char *match); |