diff options
Diffstat (limited to 'src/gpg.c')
| -rw-r--r-- | src/gpg.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -134,7 +134,7 @@ create_gpg_homedir() } static int -checksig(gpgme_signature_t sig, const char *uid, struct file_triplet *trp) +checksig(gpgme_signature_t sig, const char *uid, struct wy_triplet *trp) { switch (gpg_err_code(sig->status)) { case GPG_ERR_NO_ERROR: @@ -184,7 +184,7 @@ checksig(gpgme_signature_t sig, const char *uid, struct file_triplet *trp) static int gpg_verify_signature(gpgme_ctx_t ctx, gpgme_signature_t sig, - struct file_triplet *trp) + struct wy_triplet *trp) { if (!sig) return 0; @@ -208,7 +208,7 @@ gpg_verify_signature(gpgme_ctx_t ctx, gpgme_signature_t sig, /* Verify the directive file from TRP using public key PUBKEY */ int -verify_directive_signature(struct file_triplet *trp) +verify_directive_signature(struct wy_triplet *trp) { gpgme_ctx_t ctx; gpgme_data_t key_data, directive_data, plain = NULL; @@ -219,7 +219,7 @@ verify_directive_signature(struct file_triplet *trp) create_gpg_homedir(); fail_if_err(gpgme_new(&ctx)); - for (uptr = triplet_get_uploaders(trp); uptr; uptr = uptr->next) { + for (uptr = wy_triplet_get_uploaders(trp); uptr; uptr = uptr->next) { gpgme_import_result_t res; gpgme_import_status_t pstat; @@ -246,7 +246,7 @@ verify_directive_signature(struct file_triplet *trp) if (!gpg_verify_signature(ctx, result->signatures, trp)) { UPDATE_STATS(STAT_BAD_SIGNATURE); notify(trp->spool->notification, trp, - ev_bad_directive_signature); + wy_ev_bad_directive_signature); rc = 1; } else rc = 0; @@ -269,7 +269,7 @@ verify_directive_signature(struct file_triplet *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) +verify_detached_signature(struct wy_triplet *trp) { gpgme_engine_info_t info; const char *argv[5]; @@ -302,7 +302,7 @@ verify_detached_signature(struct file_triplet *trp) case exec_fail: UPDATE_STATS(STAT_BAD_SIGNATURE); wy_log(LOG_ERR, _("BAD detached signature for %s"), trp->name); - notify(spool->notification, trp, ev_bad_detached_signature); + notify(spool->notification, trp, wy_ev_bad_detached_signature); break; case exec_error: |