diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-01-03 11:44:34 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-01-03 11:49:20 +0200 |
commit | c2cbf4e863a8f3a5081357d4b48f54cec2cd5d69 (patch) | |
tree | 93711f398c585fcc8ac0b19bbcfe15b79f4c6b73 /src/gpg.c | |
parent | a2489ce17e9c9a03b649d5b63183d4f830c639a1 (diff) | |
download | wydawca-c2cbf4e863a8f3a5081357d4b48f54cec2cd5d69.tar.gz wydawca-c2cbf4e863a8f3a5081357d4b48f54cec2cd5d69.tar.bz2 |
Do not pass spool as a separate parameter, register it early in the triplet.
* src/directive.c (process_directives): Remove spool parameter.
* src/gpg.c (verify_directive_signature)
(verify_detached_signature): Remove spool parameter.
* src/process.c (scan_spool_unlocked): Update call to register_file.
* src/triplet.c (register_file): Take spool ptr as second argument.
(triplet_processor): Ignore proc_data.
(enumerate_triplets): Pass NULL as proc_data.
* src/verify.c (verify_directive_file): Remove spool parameter.
* src/wydawca.h (ASGN_SPOOL): New macro.
(register_file, verify_directive_file)
(verify_directive_signature, verify_detached_signature)
(process_directives): Remove spool parameter.
* src/getopt.m4 (print_help): Minor fix.
Diffstat (limited to 'src/gpg.c')
-rw-r--r-- | src/gpg.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -212,16 +212,14 @@ gpg_verify_signature (gpgme_ctx_t ctx, gpgme_signature_t sig, } } return 1; } /* 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; gpgme_data_t key_data, directive_data, plain; gpgme_error_t ec; int rc; struct uploader_info *uptr; @@ -256,13 +254,13 @@ verify_directive_signature (struct file_triplet *trp, gpgme_verify_result_t result; result = gpgme_op_verify_result (ctx); if (!gpg_verify_signature (ctx, result->signatures, 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; } else rc = 0; } else @@ -280,17 +278,19 @@ verify_directive_signature (struct file_triplet *trp, } /* Verify the detached signature of TRP. NOTE: It is assumed that the public key is already registered (by 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) info = info->next; if (!info) { |