diff options
| author | Justus Winter <[email protected]> | 2015-11-26 14:01:40 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2015-11-26 14:01:40 +0000 |
| commit | 1a045b1324efabe7423a8d00245f01718ed72556 (patch) | |
| tree | dff462aee1851881a41b27ee679dbb42f19082ce /g13/mount.c | |
| parent | tools/gpgtar: Handle '--tar-args' for compatibility with gpg-zip. (diff) | |
| download | gnupg-1a045b1324efabe7423a8d00245f01718ed72556.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'g13/mount.c')
| -rw-r--r-- | g13/mount.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g13/mount.c b/g13/mount.c index 1f7fbcc4c..e9b9c1be7 100644 --- a/g13/mount.c +++ b/g13/mount.c @@ -202,7 +202,8 @@ decrypt_keyblob (ctrl_t ctrl, const void *enckeyblob, size_t enckeybloblen, gpg_error_t err; /* FIXME: For now we only implement OpenPGP. */ - err = gpg_decrypt_blob (ctrl, opt.gpg_program, enckeyblob, enckeybloblen, + err = gpg_decrypt_blob (ctrl, opt.gpg_program, opt.gpg_arguments, + enckeyblob, enckeybloblen, r_keyblob, r_keybloblen); return err; |