projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
not having wide chars is soooo 90, please, I *really* don't care with
[apps/madmutt.git]
/
lib-crypt
/
pgp.c
diff --git
a/lib-crypt/pgp.c
b/lib-crypt/pgp.c
index
1c9e4bc
..
7147bf1
100644
(file)
--- a/
lib-crypt/pgp.c
+++ b/
lib-crypt/pgp.c
@@
-31,6
+31,8
@@
#include <lib-ui/curses.h>
#include <lib-ui/enter.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 "handler.h"
#include "mutt.h"
#include "handler.h"
@@
-38,7
+40,6
@@
#include "copy.h"
#include "attach.h"
#include "copy.h"
#include "attach.h"
-#include "lib/debug.h"
#include <sys/wait.h>
#include <string.h>
#include <sys/wait.h>
#include <string.h>
@@
-61,7
+62,6
@@
#endif
#include "crypt.h"
#endif
#include "crypt.h"
-#include "mutt_menu.h"
char PgpPass[LONG_STRING];
char PgpPass[LONG_STRING];
@@
-69,7
+69,7
@@
time_t PgpExptime = 0; /* when does the cached passphrase expire? */
void pgp_void_passphrase (void)
{
void pgp_void_passphrase (void)
{
- p_clear(PgpPass,
size
of(PgpPass));
+ p_clear(PgpPass,
count
of(PgpPass));
PgpExptime = 0;
}
PgpExptime = 0;
}
@@
-420,7
+420,6
@@
int pgp_application_pgp_handler (BODY * m, STATE * s)
}
else if (pgpout) {
FGETCONV *fc;
}
else if (pgpout) {
FGETCONV *fc;
- int c;
rewind (pgpout);
state_set_prefix (s);
rewind (pgpout);
state_set_prefix (s);
@@
-1145,8
+1144,8
@@
char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
}
else if (r == -1) {
p_delete(&keylist);
}
else if (r == -1) {
p_delete(&keylist);
- address_
delete
(&tmp);
- address_
delete
(&addr);
+ address_
list_wipe
(&tmp);
+ address_
list_wipe
(&addr);
return NULL;
}
}
return NULL;
}
}
@@
-1162,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);
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;
}
}
return NULL;
}
}
@@
-1180,10
+1179,10
@@
char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
keylist_used = m_strlen(keylist);
pgp_free_key (&key);
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);
}
return (keylist);
}