X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fsmime.c;h=1683a870a52b47cef5a51ee687ffb2728eca9d3f;hp=d5202873802217bf0990208d03e6f7ca9ef46d08;hb=108f3c7ab59844591f7540347914ea57be5245e2;hpb=ecfcc6df70230ba136c2fb3843700ecb749c41b7

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index d520287..1683a87 100644
--- a/lib-crypt/smime.c
+++ b/lib-crypt/smime.c
@@ -17,18 +17,18 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
 
 #include "mutt.h"
 #include "handler.h"
-#include "mutt_menu.h"
 #include "copy.h"
 
-#include "lib/debug.h"
 
 #include <sys/wait.h>
 #include <string.h>
@@ -102,7 +102,7 @@ static char SmimeIntermediateToUse[_POSIX_PATH_MAX];
 
 void smime_void_passphrase (void)
 {
-  p_clear(SmimePass, sizeof(SmimePass));
+  p_clear(SmimePass, countof(SmimePass));
   SmimeExptime = 0;
 }
 
@@ -720,7 +720,7 @@ void smime_getkeys (ENVELOPE * env)
     }
   if (!found && (t = mutt_default_from ())) {
     _smime_getkeys (t->mailbox);
-    address_delete (&t);
+    address_list_wipe(&t);
   }
 }
 
@@ -777,8 +777,8 @@ char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
     if (!keyID) {
       mutt_message (_("No (valid) certificate found for %s."), q->mailbox);
       p_delete(&keylist);
-      address_delete (&tmp);
-      address_delete (&addr);
+      address_list_wipe(&tmp);
+      address_list_wipe(&addr);
       return NULL;
     }
 
@@ -787,10 +787,10 @@ char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
     sprintf (keylist + keylist_used, "%s\n", keyID);    /* __SPRINTF_CHECKED__ */
     keylist_used = m_strlen(keylist);
 
-    address_delete (&addr);
+    address_list_wipe(&addr);
 
   }
-  address_delete (&tmp);
+  address_list_wipe(&tmp);
   return (keylist);
 }