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/mount.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'g13/mount.c') diff --git a/g13/mount.c b/g13/mount.c index 8d1c0150f..1f7fbcc4c 100644 --- a/g13/mount.c +++ b/g13/mount.c @@ -34,7 +34,7 @@ #include "backend.h" #include "utils.h" #include "../common/sysutils.h" -#include "call-gpg.h" +#include "../common/call-gpg.h" #include "mountinfo.h" #include "runner.h" #include "host2net.h" @@ -202,7 +202,7 @@ 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, enckeyblob, enckeybloblen, + err = gpg_decrypt_blob (ctrl, opt.gpg_program, enckeyblob, enckeybloblen, r_keyblob, r_keybloblen); return err; -- cgit v1.2.3