diff options
Diffstat (limited to 'src/gpg.c')
| -rw-r--r-- | src/gpg.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -216,8 +216,6 @@ gpg_verify_signature (gpgme_ctx_t ctx, gpgme_signature_t sig, /* Verify the directive file from TRP using public key PUBKEY */ -/* FIXME: spool currently unused */ int -verify_directive_signature (struct file_triplet *trp, - const struct spool *spool) +verify_directive_signature (struct file_triplet *trp) { gpgme_ctx_t ctx; @@ -226,5 +224,5 @@ verify_directive_signature (struct file_triplet *trp, int rc; struct uploader_info *uptr; - + create_gpg_homedir (); fail_if_err (gpgme_new (&ctx)); @@ -260,5 +258,5 @@ verify_directive_signature (struct file_triplet *trp, { UPDATE_STATS (STAT_BAD_SIGNATURE); - notify (spool->notification, trp, ev_bad_directive_signature); + notify (trp->spool->notification, trp, ev_bad_directive_signature); rc = 1; } @@ -284,10 +282,12 @@ verify_directive_signature (struct file_triplet *trp, a previous call to verify_directive_signature). */ int -verify_detached_signature (struct file_triplet *trp, - const struct spool *spool) +verify_detached_signature (struct file_triplet *trp) { gpgme_engine_info_t info; const char *argv[5]; + const struct spool *spool; + ASGN_SPOOL (spool, trp, return 1); + fail_if_err (gpgme_get_engine_info (&info)); while (info && info->protocol != GPGME_PROTOCOL_OpenPGP) |