summaryrefslogtreecommitdiffabout
path: root/src/gpg.c
Unidiff
Diffstat (limited to 'src/gpg.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/gpg.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpg.c b/src/gpg.c
index cca5048..979d0c0 100644
--- a/src/gpg.c
+++ b/src/gpg.c
@@ -215,17 +215,15 @@ gpg_verify_signature (gpgme_ctx_t ctx, gpgme_signature_t sig,
215} 215}
216 216
217/* Verify the directive file from TRP using public key PUBKEY */ 217/* Verify the directive file from TRP using public key PUBKEY */
218/* FIXME: spool currently unused */
219int 218int
220verify_directive_signature (struct file_triplet *trp, 219verify_directive_signature (struct file_triplet *trp)
221 const struct spool *spool)
222{ 220{
223 gpgme_ctx_t ctx; 221 gpgme_ctx_t ctx;
224 gpgme_data_t key_data, directive_data, plain; 222 gpgme_data_t key_data, directive_data, plain;
225 gpgme_error_t ec; 223 gpgme_error_t ec;
226 int rc; 224 int rc;
227 struct uploader_info *uptr; 225 struct uploader_info *uptr;
228 226
229 create_gpg_homedir (); 227 create_gpg_homedir ();
230 fail_if_err (gpgme_new (&ctx)); 228 fail_if_err (gpgme_new (&ctx));
231 229
@@ -259,7 +257,7 @@ verify_directive_signature (struct file_triplet *trp,
259 if (!gpg_verify_signature (ctx, result->signatures, trp)) 257 if (!gpg_verify_signature (ctx, result->signatures, trp))
260 { 258 {
261 UPDATE_STATS (STAT_BAD_SIGNATURE); 259 UPDATE_STATS (STAT_BAD_SIGNATURE);
262 notify (spool->notification, trp, ev_bad_directive_signature); 260 notify (trp->spool->notification, trp, ev_bad_directive_signature);
263 rc = 1; 261 rc = 1;
264 } 262 }
265 else 263 else
@@ -283,12 +281,14 @@ verify_directive_signature (struct file_triplet *trp,
283 NOTE: It is assumed that the public key is already registered (by 281 NOTE: It is assumed that the public key is already registered (by
284 a previous call to verify_directive_signature). */ 282 a previous call to verify_directive_signature). */
285int 283int
286verify_detached_signature (struct file_triplet *trp, 284verify_detached_signature (struct file_triplet *trp)
287 const struct spool *spool)
288{ 285{
289 gpgme_engine_info_t info; 286 gpgme_engine_info_t info;
290 const char *argv[5]; 287 const char *argv[5];
288 const struct spool *spool;
291 289
290 ASGN_SPOOL (spool, trp, return 1);
291
292 fail_if_err (gpgme_get_engine_info (&info)); 292 fail_if_err (gpgme_get_engine_info (&info));
293 while (info && info->protocol != GPGME_PROTOCOL_OpenPGP) 293 while (info && info->protocol != GPGME_PROTOCOL_OpenPGP)
294 info = info->next; 294 info = info->next;

Return to:

Send suggestions and report system problems to the System administrator.