diff options
| author | Neal H. Walfield <neal@g10code.com> | 2015-11-05 12:20:42 +0100 |
|---|---|---|
| committer | Neal H. Walfield <neal@g10code.com> | 2015-11-05 14:16:33 +0100 |
| commit | ec409e62aea6cc829299be794f9d035d033cb51b (patch) | |
| tree | 751b85be355f5e858c384cd0d2d771fc7b372878 /g10/packet.h | |
| parent | common: Add a function for copying data from one iobuf to another. (diff) | |
| download | gnupg2-ec409e62aea6cc829299be794f9d035d033cb51b.tar.xz gnupg2-ec409e62aea6cc829299be794f9d035d033cb51b.zip | |
gpg: Add support for unwrapping the outer level of encryption.
* g10/decrypt-data.c (decrypt_data): If OPT.UNWRAP_ENCRYPTION is set,
copy the data to the output file instead of continuing to process it.
* g10/gpg.c (enum cmd_and_opt_values): Add new value oUnwrap.
(opts): Handle oUnwrap.
(main): Likewise.
* g10/options.h (opt): Add field unwrap_encryption.
* g10/plaintext.c (handle_plaintext): Break the output file selection
functionality into ...
(get_output_file): ... this new function.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
GnuPG-bug-id: 1060
Debian-bug-id: 282061
Diffstat (limited to 'g10/packet.h')
| -rw-r--r-- | g10/packet.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/packet.h b/g10/packet.h index 21c80f3f2..387a5b5cd 100644 --- a/g10/packet.h +++ b/g10/packet.h @@ -663,6 +663,8 @@ int handle_compressed (ctrl_t ctrl, void *ctx, PKT_compressed *cd, int decrypt_data (ctrl_t ctrl, void *ctx, PKT_encrypted *ed, DEK *dek ); /*-- plaintext.c --*/ +gpg_error_t get_output_file (const byte *embedded_name, int embedded_namelen, + iobuf_t data, char **fnamep, estream_t *fpp); int handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx, int nooutput, int clearsig ); int ask_for_detached_datafile( gcry_md_hd_t md, gcry_md_hd_t md2, |