X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fcrypt-gpgme.c;h=7b6787ecd6a765fccbbcc635850ec9b3cd5fe4c9;hp=70d07135afb928bd51bbe9cf0cdb32256c9f4063;hb=64a23f5574b096605383ef1886c7d0d6c42aeeee;hpb=75147b39ee208b0e6257bc483d96b20b1f5a7995

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index 70d0713..7b6787e 100644
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -94,6 +94,28 @@ typedef struct crypt_entry {
 static struct crypt_cache *id_defaults = NULL;
 static gpgme_key_t signature_key = NULL;
 
+/* Initialization.  */
+void crypt_init(void)
+{
+    /* Make sure that gpg-agent is running.  */
+    if (!getenv ("GPG_AGENT_INFO")) {
+        mutt_error ("\nUsing GPGME backend, although no gpg-agent is running");
+        if (mutt_any_key_to_continue (NULL) == -1)
+            mutt_exit (1);
+    }
+}
+
+/* Show a message that a backend will be invoked. */
+void crypt_invoke_message (int type)
+{
+    if (type & APPLICATION_PGP) {
+        mutt_message _("Invoking PGP...");
+    }
+    else if (type & APPLICATION_SMIME) {
+        mutt_message _("Invoking S/MIME...");
+    }
+}
+
 /*
  * General helper functions.
  */
@@ -683,9 +705,7 @@ static void print_time (time_t t, STATE * s)
   state_attach_puts (p, s);
 }
 
-/* 
- * Implementation of `sign_message'.
- */
+/* Implementation of `sign_message'. */
 
 /* Sign the MESSAGE in body A either using OpenPGP or S/MIME when
    USE_SMIME is passed as true.  Returns the new body or NULL on
@@ -779,12 +799,12 @@ static BODY *sign_message (BODY * a, int use_smime)
 }
 
 
-BODY *pgp_gpgme_sign_message (BODY * a)
+BODY *crypt_pgp_sign_message (BODY * a)
 {
   return sign_message (a, 0);
 }
 
-BODY *smime_gpgme_sign_message (BODY * a)
+BODY *crypt_smime_sign_message (BODY * a)
 {
   return sign_message (a, 1);
 }
@@ -795,7 +815,7 @@ BODY *smime_gpgme_sign_message (BODY * a)
 
 /* Encrypt the mail body A to all keys given as space separated keyids
    or fingerprints in KEYLIST and return the encrypted body.  */
-BODY *pgp_gpgme_encrypt_message (BODY * a, char *keylist, int sign)
+BODY *crypt_pgp_encrypt_message (BODY * a, char *keylist, int sign)
 {
   char *outfile = NULL;
   BODY *t;
@@ -896,9 +916,7 @@ BODY *smime_gpgme_build_smime_entity (BODY * a, char *keylist)
 }
 
 
-/* 
- * Implementation of `verify_one'.
- */
+/* Implementation of `verify_one'. */
 
 /* Display the common attributes of the signature summary SUM.
    Return 1 if there is is a severe warning.
@@ -1295,12 +1313,12 @@ static int verify_one (BODY * sigbdy, STATE * s,
   return badsig ? 1 : anywarn ? 2 : 0;
 }
 
-int pgp_gpgme_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
+int crypt_pgp_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
 {
   return verify_one (sigbdy, s, tempfile, 0);
 }
 
-int smime_gpgme_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
+int crypt_smime_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
 {
   return verify_one (sigbdy, s, tempfile, 1);
 }
@@ -1445,7 +1463,7 @@ restart:
 
 /* Decrypt a PGP/MIME message in FPIN and B and return a new body and
    the stream in CUR and FPOUT.  Returns 0 on success. */
-int pgp_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
+int crypt_pgp_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
 {
   char tempfile[_POSIX_PATH_MAX];
   STATE s;
@@ -1483,7 +1501,7 @@ int pgp_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
 
 /* Decrypt a S/MIME message in FPIN and B and return a new body and
    the stream in CUR and FPOUT.  Returns 0 on success. */
-int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
+int crypt_smime_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
                               BODY ** cur)
 {
   char tempfile[_POSIX_PATH_MAX];
@@ -1656,14 +1674,14 @@ static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
   return 1;
 }
 
-int pgp_gpgme_check_traditional (FILE * fp, BODY * b, int tagged_only)
+int crypt_pgp_check_traditional (FILE * fp, BODY * b, int tagged_only)
 {
   int rv = 0;
   int r;
 
   for (; b; b = b->next) {
     if (is_multipart (b))
-      rv = (pgp_gpgme_check_traditional (fp, b->parts, tagged_only) || rv);
+      rv = (crypt_pgp_check_traditional (fp, b->parts, tagged_only) || rv);
     else if (b->type == TYPETEXT) {
       if ((r = mutt_is_application_pgp (b)))
         rv = (rv || r);
@@ -1675,9 +1693,7 @@ int pgp_gpgme_check_traditional (FILE * fp, BODY * b, int tagged_only)
 }
 
 
-/* 
- * Implementation of `application_handler'.
- */
+/* Implementation of `application_handler'. */
 
 /* 
   Copy a clearsigned message, and strip the signature and PGP's
@@ -1740,7 +1756,7 @@ static void copy_clearsigned (gpgme_data_t data, STATE * s, char *charset)
 
 
 /* Support for classic_application/pgp */
-int pgp_gpgme_application_handler (BODY * m, STATE * s)
+int crypt_pgp_application_pgp_handler (BODY * m, STATE * s)
 {
   int needpass = -1, pgp_keyblock = 0;
   int clearsign = 0;
@@ -2043,7 +2059,7 @@ int pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
 }
 
 /* Support for application/smime */
-int smime_gpgme_application_handler (BODY * a, STATE * s)
+int crypt_smime_application_smime_handler (BODY * a, STATE * s)
 {
   char tempfile[_POSIX_PATH_MAX];
   FILE *fpout;
@@ -2973,10 +2989,7 @@ leave:
   mutt_do_pager (cmd, tempfile, 0, NULL);
 }
 
-/* 
- * Implementation of `findkeys'.
- */
-
+/* Implementation of `findkeys'. */
 
 /* Convert string_list_t into a pattern string suitable to be passed to GPGME.
    We need to convert spaces in an item into a '+' and '%' into
@@ -3716,40 +3729,16 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
   return (keylist);
 }
 
-char *pgp_gpgme_findkeys (address_t * to, address_t * cc, address_t * bcc)
+char *crypt_pgp_findkeys (address_t * to, address_t * cc, address_t * bcc)
 {
   return find_keys (to, cc, bcc, APPLICATION_PGP);
 }
 
-char *smime_gpgme_findkeys (address_t * to, address_t * cc, address_t * bcc)
+char *crypt_smime_findkeys (address_t * to, address_t * cc, address_t * bcc)
 {
   return find_keys (to, cc, bcc, APPLICATION_SMIME);
 }
 
-/*
- * Implementation of `init'.
- */
-
-/* Initialization.  */
-static void init_gpgme (void)
-{
-  /* Make sure that gpg-agent is running.  */
-  if (!getenv ("GPG_AGENT_INFO")) {
-    mutt_error ("\nUsing GPGME backend, although no gpg-agent is running");
-    if (mutt_any_key_to_continue (NULL) == -1)
-      mutt_exit (1);
-  }
-}
-
-void pgp_gpgme_init (void)
-{
-  init_gpgme ();
-}
-
-void smime_gpgme_init (void)
-{
-}
-
 static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
 {
   crypt_key_t *p;
@@ -3825,17 +3814,17 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
   return (msg->security);
 }
 
-int pgp_gpgme_send_menu (HEADER * msg, int *redraw)
+int crypt_pgp_send_menu(HEADER * msg, int *redraw)
 {
-  return gpgme_send_menu (msg, redraw, 0);
+  return gpgme_send_menu(msg, redraw, 0);
 }
 
-int smime_gpgme_send_menu (HEADER * msg, int *redraw)
+int crypt_smime_send_menu(HEADER * msg, int *redraw)
 {
   return gpgme_send_menu (msg, redraw, 1);
 }
 
-static int verify_sender (HEADER * h, gpgme_protocol_t protocol __attribute__((unused)))
+int crypt_smime_verify_sender (HEADER * h)
 {
   address_t *sender = NULL;
   unsigned int ret = 1;
@@ -3880,14 +3869,9 @@ static int verify_sender (HEADER * h, gpgme_protocol_t protocol __attribute__((u
   return ret;
 }
 
-int smime_gpgme_verify_sender (HEADER * h)
+static void invoke_import(const char *fname, int smime)
 {
-  return verify_sender (h, GPGME_PROTOCOL_CMS);
-}
-
-void pgp_gpgme_invoke_import(const char *fname)
-{
-    gpgme_ctx_t ctx = create_gpgme_context(0);
+    gpgme_ctx_t ctx = create_gpgme_context(smime);
     gpgme_data_t data;
     gpgme_error_t err;
 
@@ -3911,6 +3895,16 @@ void pgp_gpgme_invoke_import(const char *fname)
     return;
 }
 
+void crypt_pgp_invoke_import(const char *fname)
+{
+    invoke_import(fname, 0);
+}
+
+void crypt_smime_invoke_import(const char *fname)
+{
+    invoke_import(fname, 1);
+}
+
 static void pgp_extract_keys_from_attachment (FILE * fp, BODY * top)
 {
   STATE s;
@@ -3931,11 +3925,11 @@ static void pgp_extract_keys_from_attachment (FILE * fp, BODY * top)
   mutt_body_handler (top, &s);
 
   m_fclose(&tempfp);
-  pgp_gpgme_invoke_import(tempfname);
+  crypt_pgp_invoke_import(tempfname);
   mutt_unlink (tempfname);
 }
 
-void pgp_gpgme_from_attachment_list (FILE * fp, int tag, BODY * top)
+void crypt_pgp_extract_keys_from_attachment_list(FILE * fp, int tag, BODY * top)
 {
   mutt_endwin (NULL);
   set_option (OPTDONTHANDLEPGPKEYS);