From 37e932658cbd873ac96ff7e2067a97dffc2e0507 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 13 Aug 2016 17:39:28 +0200 Subject: g13: Move some function around. * g13/keyblob.c (g13_keyblob_decrypt): Move to ... * g13/server.c: to here. * g13/suspend.c, g13/mount.c: Include server.h. * g13/Makefile.am (g13_syshelp_SOURCES): Add keyblob.c -- This is done to be able to use keyblob read code in syshelp w/o requiring linking to call-gpg.c Signed-off-by: Werner Koch --- g13/keyblob.c | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'g13/keyblob.c') diff --git a/g13/keyblob.c b/g13/keyblob.c index cad0c4f80..8a5b622ab 100644 --- a/g13/keyblob.c +++ b/g13/keyblob.c @@ -28,12 +28,10 @@ #include #include "g13.h" -#include "i18n.h" #include "mount.h" #include "keyblob.h" #include "../common/sysutils.h" -#include "../common/call-gpg.h" #include "host2net.h" @@ -207,23 +205,3 @@ g13_keyblob_read (const char *filename, return err; } - - -/* - * Decrypt the keyblob (ENCKEYBLOB,ENCKEYBLOBLEN) and store the result - * at (R_KEYBLOB, R_KEYBLOBLEN). Returns 0 on success or an error - * code. On error R_KEYBLOB is set to NULL. - */ -gpg_error_t -g13_keyblob_decrypt (ctrl_t ctrl, const void *enckeyblob, size_t enckeybloblen, - void **r_keyblob, size_t *r_keybloblen) -{ - gpg_error_t err; - - /* FIXME: For now we only implement OpenPGP. */ - err = gpg_decrypt_blob (ctrl, opt.gpg_program, opt.gpg_arguments, - enckeyblob, enckeybloblen, - r_keyblob, r_keybloblen); - - return err; -} -- cgit v1.2.3