Changeset 5439:d8bbdcd01ec4

Timestamp:

2008-07-01 17:57:37 (3 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Stub in a gpgme version of extract-keys. It doesn't currently work
right because apparently while gpg on the command line can parse a
whole message, we'll have to do it for gpgme. I really wonder about
the 'ME' part of GPGME sometimes.

Files:

• ChangeLog (modified) (1 diff)
• crypt-gpgme.c (modified) (7 diffs)
• crypt-gpgme.h (modified) (1 diff)
• crypt-mod-pgp-gpgme.c (modified) (2 diffs)

ChangeLog

@@ -1 @@
-2008-07-01 13:32 -0700  Brendan Cully  <brendan@kublai.com>  (17525e17fa7b)
+2008-07-01 17:20 -0700  Brendan Cully  <brendan@kublai.com>  (8e2438ec5909)
+
+        * crypt-gpgme.c, lib.c, lib.h: Support displaying application/pgp-keys
+        with GPGME. This was pretty convoluted because GPGME provides no way
+        to examine a key block without importing it. This code creates a
+        temporary GPG home in which to import the key in order to display
+        it.
+
+        * crypt-gpgme.c, handler.c, pgp.c: Handle DONTHANDLEPGPKEYS in
+        handler instead of crypto modules. This lets gpgme and classic pgp
+        share a bit of logic, and unbreaks key extraction at least for
+        classic PGP.
 
         * copy.c: Bail out of copy if decryption is requested but the desired

crypt-gpgme.c

@@ -1839 +1839 @@
 }
 
-static int pgp_gpgme_extract_keys (gpgme_data_t keydata, FILE** fp)
+static int pgp_gpgme_extract_keys (gpgme_data_t keydata, FILE** fp, int dryrun)
 {
   /* there's no side-effect free way to view key data in GPGME,
@@ -1857 +1857 @@
   int rc = -1;
 
-  snprintf (tmpdir, sizeof(tmpdir), "%s/mutt-gpgme-XXXXXX", Tempdir);
-  if (!mkdtemp (tmpdir))
-  {
-    dprint (1, (debugfile, "Error creating temporary GPGME home\n"));
-    return rc;
-  }
-
   if ((err = gpgme_new (&tmpctx)) != GPG_ERR_NO_ERROR)
   {
     dprint (1, (debugfile, "Error creating GPGME context\n"));
-    goto err_tmpdir;
+    return rc;
   }
-
-  engineinfo = gpgme_ctx_get_engine_info (tmpctx);
-  while (engineinfo && engineinfo->protocol != GPGME_PROTOCOL_OpenPGP)
-    engineinfo = engineinfo->next;
-  if (!engineinfo)
+  
+  if (dryrun)
   {
-    dprint (1, (debugfile, "Error finding GPGME PGP engine\n"));
-    goto err_ctx;
-  }
-  
-  err = gpgme_ctx_set_engine_info (tmpctx, GPGME_PROTOCOL_OpenPGP,
-                                   engineinfo->file_name, tmpdir);
-  if (err != GPG_ERR_NO_ERROR)
-  {
-    dprint (1, (debugfile, "Error setting GPGME context home\n"));
-    goto err_ctx;
+    snprintf (tmpdir, sizeof(tmpdir), "%s/mutt-gpgme-XXXXXX", Tempdir);
+    if (!mkdtemp (tmpdir))
+    {
+      dprint (1, (debugfile, "Error creating temporary GPGME home\n"));
+      goto err_ctx;
+    }
+
+    engineinfo = gpgme_ctx_get_engine_info (tmpctx);
+    while (engineinfo && engineinfo->protocol != GPGME_PROTOCOL_OpenPGP)
+      engineinfo = engineinfo->next;
+    if (!engineinfo)
+    {
+      dprint (1, (debugfile, "Error finding GPGME PGP engine\n"));
+      goto err_tmpdir;
+    }
+
+    err = gpgme_ctx_set_engine_info (tmpctx, GPGME_PROTOCOL_OpenPGP,
+                                     engineinfo->file_name, tmpdir);
+    if (err != GPG_ERR_NO_ERROR)
+    {
+      dprint (1, (debugfile, "Error setting GPGME context home\n"));
+      goto err_tmpdir;
+    }
   }
 
@@ -1890 +1893 @@
   {
     dprint (1, (debugfile, "Error importing key\n"));
-    goto err_ctx;
+    goto err_tmpdir;
   }
 
@@ -1898 +1901 @@
   {
     mutt_perror (tmpfile);
-    goto err_ctx;
+    goto err_tmpdir;
   }
   unlink (tmpfile);
@@ -1945 +1948 @@
     *fp = NULL;
   }
+err_tmpdir:
+  if (dryrun)
+    mutt_rmtree (tmpdir);
 err_ctx:
   gpgme_release (tmpctx);
-err_tmpdir:
-  mutt_rmtree (tmpdir);
 
   return rc;
@@ -2033 +2037 @@
   }
   return rv;
+}
+
+/* TODO: looks like this won't work and we'll have to fully parse the
+ * message file. GPGME makes life hard yet again. */
+void pgp_gpgme_invoke_import (const char *fname)
+{
+  gpgme_data_t keydata;
+  gpgme_error_t err;
+  FILE* in;
+  FILE* out;
+  long outlen;
+
+  if (!(in = safe_fopen (fname, "r")))
+    return;
+  if ((err = gpgme_data_new_from_stream (&keydata, in)) != GPG_ERR_NO_ERROR)
+  {
+    dprint (1, (debugfile, "error converting key file into data object\n"));
+    return;
+  }
+  fclose (in);
+
+  if (!pgp_gpgme_extract_keys (keydata, &out, 0))
+  {
+    /* display import results */
+    outlen = ftell (out);
+    fseek (out, 0, SEEK_SET);
+    mutt_copy_bytes (out, stdout, outlen);
+    fclose (out);
+  }
+  else
+    printf (_("Error extracting key data!\n"));
 }
 
@@ -2180 +2215 @@
           if (pgp_keyblock)
           {
-            pgp_gpgme_extract_keys (armored_data, &pgpout);
+            pgp_gpgme_extract_keys (armored_data, &pgpout, 1);
           }
           else if (!clearsign || (s->flags & M_VERIFY))

crypt-gpgme.h

@@ -35 +35 @@
 
 int pgp_gpgme_check_traditional (FILE *fp, BODY *b, int tagged_only);
+void pgp_gpgme_invoke_import (const char* fname);
 
 int pgp_gpgme_application_handler (BODY *m, STATE *s);

crypt-mod-pgp-gpgme.c

@@ -66 +66 @@
 }
 
+static void crypt_mod_pgp_invoke_import (const char *fname)
+{
+  pgp_gpgme_invoke_import (fname);
+}
+
 static char *crypt_mod_pgp_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc)
 {
@@ -118 +123 @@
       NULL,                     /* pgp_traditional_encryptsign  */
       NULL, /* pgp_invoke_getkeys  */
-      NULL, /* pgp_invoke_import  */
+      crypt_mod_pgp_invoke_import,
       NULL, /* pgp_extract_keys_from_attachment_list  */