diff options
| author | Justus Winter <justus@g10code.com> | 2015-11-26 15:01:40 +0100 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2015-11-26 15:01:40 +0100 |
| commit | 1a045b1324efabe7423a8d00245f01718ed72556 (patch) | |
| tree | dff462aee1851881a41b27ee679dbb42f19082ce /tools/gpgtar-extract.c | |
| parent | tools/gpgtar: Handle '--tar-args' for compatibility with gpg-zip. (diff) | |
| download | gnupg2-1a045b1324efabe7423a8d00245f01718ed72556.tar.xz gnupg2-1a045b1324efabe7423a8d00245f01718ed72556.zip | |
common: Make the GPG arguments configurable in call-gpg.
* common/call-gpg.c (start_gpg): Add parameter 'gpg_arguments'.
(_gpg_encrypt, gpg_encrypt_blob, gpg_encrypt_stream): Likewise.
(_gpg_decrypt, gpg_decrypt_blob, gpg_decrypt_stream): Likewise.
* common/call-gpg.h: Adapt prototypes.
* g13/create.c (encrypt_keyblob): Adapt callsite.
* g13/g13-common.h (opt): Add field 'gpg_arguments'.
* g13/g13.c (main): Construct default arguments.
* g13/mount.c (decrypt_keyblob): Adapt callsite.
* tools/gpgtar-create.c (gpgtar_create): Likewise.
* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
* tools/gpgtar-list.c (gpgtar_list): Likewise.
Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to 'tools/gpgtar-extract.c')
| -rw-r--r-- | tools/gpgtar-extract.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c index fa2f3626a..7e7a351ba 100644 --- a/tools/gpgtar-extract.c +++ b/tools/gpgtar-extract.c @@ -303,7 +303,8 @@ gpgtar_extract (const char *filename, int decrypt) err = gpg_error_from_syserror (); goto leave; } - err = gpg_decrypt_stream (NULL, opt.gpg_program, cipher_stream, stream); + err = gpg_decrypt_stream (NULL, opt.gpg_program, NULL, + cipher_stream, stream); if (err) goto leave; |