diff options
| author | Justus Winter <justus@g10code.com> | 2015-11-24 13:40:56 +0100 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2015-11-25 12:19:50 +0100 |
| commit | ba1a5cc17d43d9cba32447876f06a8ab8f97e5ae (patch) | |
| tree | c81fe95c5780376ed1a5ce59eb659915f408eee1 /g13/create.c | |
| parent | gpg: When comparing keyids, use the keyid, not the fingerprint's suffix. (diff) | |
| download | gnupg2-ba1a5cc17d43d9cba32447876f06a8ab8f97e5ae.tar.xz gnupg2-ba1a5cc17d43d9cba32447876f06a8ab8f97e5ae.zip | |
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 <justus@g10code.com>
Diffstat (limited to 'g13/create.c')
| -rw-r--r-- | g13/create.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |