X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgp.c;h=7147bf1e84cc134ea91e34a9f9e7a6b0d870c4ec;hp=26f79d9dfbf3e140bf568b907069b4a57ac15bb5;hb=10e80e482eff3762b0b8d41b0c7795b76704479c;hpb=4761fa78a6dfc9437caa6e6e0aac806e50e01c83

diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index 26f79d9..7147bf1 100644
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -29,15 +29,17 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-lib/debug.h>
+
 #include "mutt.h"
-#include "enter.h"
 #include "handler.h"
-#include "mutt_curses.h"
 #include "pgp.h"
 #include "copy.h"
 #include "attach.h"
 
-#include "lib/debug.h"
 
 #include <sys/wait.h>
 #include <string.h>
@@ -60,7 +62,6 @@
 #endif
 
 #include "crypt.h"
-#include "mutt_menu.h"
 
 
 char PgpPass[LONG_STRING];
@@ -68,7 +69,7 @@ time_t PgpExptime = 0;          /* when does the cached passphrase expire? */
 
 void pgp_void_passphrase (void)
 {
-  p_clear(PgpPass, sizeof(PgpPass));
+  p_clear(PgpPass, countof(PgpPass));
   PgpExptime = 0;
 }
 
@@ -419,7 +420,6 @@ int pgp_application_pgp_handler (BODY * m, STATE * s)
       }
       else if (pgpout) {
         FGETCONV *fc;
-        int c;
 
         rewind (pgpout);
         state_set_prefix (s);
@@ -1144,8 +1144,8 @@ char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
       }
       else if (r == -1) {
         p_delete(&keylist);
-        address_delete (&tmp);
-        address_delete (&addr);
+        address_list_wipe(&tmp);
+        address_list_wipe(&addr);
         return NULL;
       }
     }
@@ -1161,8 +1161,8 @@ char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
       if ((key = pgp_ask_for_key (buf, q->mailbox,
                                   KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) {
         p_delete(&keylist);
-        address_delete (&tmp);
-        address_delete (&addr);
+        address_list_wipe(&tmp);
+        address_list_wipe(&addr);
         return NULL;
       }
     }
@@ -1179,10 +1179,10 @@ char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
     keylist_used = m_strlen(keylist);
 
     pgp_free_key (&key);
-    address_delete (&addr);
+    address_list_wipe(&addr);
 
   }
-  address_delete (&tmp);
+  address_list_wipe(&tmp);
   return (keylist);
 }