diff options
Diffstat (limited to 'src/gpg.c')
-rw-r--r-- | src/gpg.c | 31 |
1 files changed, 4 insertions, 27 deletions
@@ -126,7 +126,7 @@ int wydawca_gpg_homedir () { if (homedir) - return; + return 0; homedir = xstrdup ("/tmp/wydawca-XXXXXX"); if (!mkdtemp (homedir)) @@ -139,6 +139,7 @@ wydawca_gpg_homedir () if (debug_level > 1) logmsg (LOG_DEBUG, "GNUPG home directory: %s", homedir); setenv ("GNUPGHOME", homedir, 1); + return 0; } /* FIXME: dpair currently unused */ @@ -164,34 +165,14 @@ verify_directive_signature (struct file_register *reg, ec = gpgme_op_verify (ctx, directive_data, NULL, plain); if (ec == GPG_ERR_NO_ERROR) { - size_t dcount, i; - char *p; - - rc = 0; - size = gpgme_data_seek (plain, 0, SEEK_END); gpgme_data_seek (plain, 0, SEEK_SET); reg->blurb = xmalloc (size + 1); gpgme_data_read (plain, reg->blurb, size); reg->blurb[size] = 0; gpgme_data_release (plain); - - dcount = 1; - for (p = reg->blurb; *p; p++) - if (*p == '\n') - dcount++; - - reg->directive = xcalloc (dcount, sizeof reg->directive[0]); - p = reg->blurb; - for (i = 0; i < dcount; i++) - { - reg->directive[i] = p; - p = strchr (p, '\n'); - if (!p) - break; - *p++ = 0; - } - reg->directive[i] = NULL; + + rc = directive_parse (reg); } else { @@ -269,7 +250,6 @@ verify_detached_signature (struct file_register *reg, struct directory_pair *dpair) { gpgme_engine_info_t info; - const char *gpg_prog; char *argv[5]; FILE *fp; pid_t pid, npid; @@ -331,9 +311,6 @@ verify_detached_signature (struct file_register *reg, rc = WEXITSTATUS (status); if (rc) { - size_t size = 0; - char *buf = NULL; - logmsg (LOG_ERR, "bad detached signature for %s", reg->name); log_output (LOG_ERR, argv[0], fp); /* FIXME: email? */ |