X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fpgpkey.c;h=637e32233ea25e49e01b99c8a84268e41135ef71;hb=676b896e26b7aeef16d95aba7a5ea9322d2dc6e1;hp=ef99d758b770b014e9586d629e77020701ed58fa;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index ef99d75..637e322 100644
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -8,39 +8,20 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/debug.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
+#include <lib-sys/unix.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 
-#include "mutt.h"
 #include "recvattach.h"
 #include "pgp.h"
 #include "pager.h"
 #include "sort.h"
 
-
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <locale.h>
-
 struct pgp_cache {
   char *what;
   char *dflt;
@@ -739,7 +720,7 @@ BODY *pgp_make_key_attachment (char *tempf)
   fclose (tempfp);
   fclose (devnull);
 
-  att = mutt_new_body ();
+  att = body_new();
   att->filename = m_strdup(tempf);
   att->unlink = 1;
   att->use_disp = 0;
@@ -814,16 +795,10 @@ pgp_key_t pgp_getkeybyaddr (address_t * a, short abilities, pgp_ring_t keyring)
   if (!keys)
     return NULL;
 
-  debug_print (5, ("looking for %s <%s>\n", a->personal, a->mailbox));
-
   for (k = keys; k; k = kn) {
     kn = k->next;
 
-    debug_print (5, ("  looking at key: %s\n", pgp_keyid (k)));
-
     if (abilities && !(k->flags & abilities)) {
-      debug_print (5, ("  insufficient abilities: Has %x, want %x\n",
-                  k->flags, abilities));
       continue;
     }
 
@@ -901,7 +876,7 @@ pgp_key_t pgp_getkeybyaddr (address_t * a, short abilities, pgp_ring_t keyring)
   return NULL;
 }
 
-pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
+pgp_key_t pgp_getkeybystr (const char *p, short abilities, pgp_ring_t keyring)
 {
   string_list_t *hints = NULL;
   pgp_key_t keys;
@@ -929,14 +904,12 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
     match = 0;
 
     for (a = k->address; a; a = a->next) {
-      debug_print (5, ("matching \"%s\" against key %s, \"%s\":\n", p, pgp_keyid (k), a->addr));
       if (!*p || m_strcasecmp(p, pgp_keyid (k)) == 0
           || (!m_strncasecmp(p, "0x", 2)
               && !m_strcasecmp(p + 2, pgp_keyid (k)))
           || (option (OPTPGPLONGIDS) && !m_strncasecmp(p, "0x", 2)
               && !m_strcasecmp(p + 2, k->keyid + 8))
           || m_stristr(a->addr, p)) {
-        debug_print (5, ("match.\n"));
         match = 1;
         break;
       }