From 1a045b1324efabe7423a8d00245f01718ed72556 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 26 Nov 2015 15:01:40 +0100 Subject: 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 --- common/call-gpg.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'common/call-gpg.h') diff --git a/common/call-gpg.h b/common/call-gpg.h index 2c5854d61..74d381985 100644 --- a/common/call-gpg.h +++ b/common/call-gpg.h @@ -26,21 +26,29 @@ typedef struct server_control_s *ctrl_t; -gpg_error_t gpg_encrypt_blob (ctrl_t ctrl, const char *gpg_program, +gpg_error_t gpg_encrypt_blob (ctrl_t ctrl, + const char *gpg_program, + strlist_t gpg_arguments, const void *plain, size_t plainlen, strlist_t keys, void **r_ciph, size_t *r_ciphlen); -gpg_error_t gpg_encrypt_stream (ctrl_t ctrl, const char *gpg_program, +gpg_error_t gpg_encrypt_stream (ctrl_t ctrl, + const char *gpg_program, + strlist_t gpg_arguments, estream_t plain_stream, strlist_t keys, estream_t cipher_stream); -gpg_error_t gpg_decrypt_blob (ctrl_t ctrl, const char *gpg_program, +gpg_error_t gpg_decrypt_blob (ctrl_t ctrl, + const char *gpg_program, + strlist_t gpg_arguments, const void *ciph, size_t ciphlen, void **r_plain, size_t *r_plainlen); -gpg_error_t gpg_decrypt_stream (ctrl_t ctrl, const char *gpg_program, +gpg_error_t gpg_decrypt_stream (ctrl_t ctrl, + const char *gpg_program, + strlist_t gpg_arguments, estream_t cipher_stream, estream_t plain_stream); -- cgit v1.2.3