From ba1a5cc17d43d9cba32447876f06a8ab8f97e5ae Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 24 Nov 2015 13:40:56 +0100 Subject: g13: Move 'call-gpg.c' to common. * common/Makefile.am (common_sources): Add files. * g13/call-gpg.c: Move to 'common' and adapt slightly. Add a parameter to let callees override the gpg program to execute. * g13/call-gpg.h: Likewise. * g13/Makefile.am (g13_SOURCES): Drop files. * g13/create.c (encrypt_keyblob): Hand in the gpg program to execute. * g13/mount.c (decrypt_keyblob): Likewise. Signed-off-by: Justus Winter --- g13/create.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'g13/create.c') diff --git a/g13/create.c b/g13/create.c index 6c09c2e81..c4e94b830 100644 --- a/g13/create.c +++ b/g13/create.c @@ -33,7 +33,7 @@ #include "keyblob.h" #include "backend.h" #include "utils.h" -#include "call-gpg.h" +#include "../common/call-gpg.h" /* Create a new blob with all the session keys and other meta information which are to be stored encrypted in the crypto @@ -111,7 +111,7 @@ encrypt_keyblob (ctrl_t ctrl, void *keyblob, size_t keybloblen, gpg_error_t err; /* FIXME: For now we only implement OpenPGP. */ - err = gpg_encrypt_blob (ctrl, keyblob, keybloblen, keys, + err = gpg_encrypt_blob (ctrl, opt.gpg_program, keyblob, keybloblen, keys, r_encblob, r_encbloblen); return err; -- cgit