Home GnuPG
Diffusion GnuPG ce8ffd71b724

gpg: Detect already compressed data also when using a pipe.

Description

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.

Backported-from-master: 60963d98cfd8e60f88ee43c2d992f6dd3bbbd74c

Note that sign.c (sign_file) has been re-indented to ease future
backports.

Details

Provenance
wernerAuthored on Wed, Jan 18, 6:04 PM
Parents
rGca822a233999: common: Replace all assert in iobuf by log_assert.
Branches
Unknown
Tags
Unknown
Tasks
T6332: GPG: Extend / rework "is_file_compressed"