X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppacket.c;h=39ebdf25b2539d95a52cbb93bdd8dadf6b998ea9;hp=9d484706ac628ff5f26a33cc120f63ec953edb3f;hb=b8c71f93b0296f815a6538182343ba67e88c0012;hpb=ef7b80006ebb47372d69c64e8b2b2f0764333d55

diff --git a/pgppacket.c b/pgppacket.c
index 9d48470..39ebdf2 100644
--- a/pgppacket.c
+++ b/pgppacket.c
@@ -17,13 +17,13 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "sha1.h"
+#include <lib-lib/mem.h>
+#include <lib-hash/hash.h>
+
 #include "lib.h"
 #include "pgplib.h"
 #include "pgppacket.h"
 
-#include "lib/mem.h"
-
 #define CHUNKSIZE 1024
 
 static unsigned char *pbuf = NULL;
@@ -65,8 +65,7 @@ unsigned char *pgp_read_packet (FILE * fp, size_t * len)
   startpos = ftello (fp);
 
   if (!plen) {
-    plen = CHUNKSIZE;
-    pbuf = mem_malloc (plen);
+    pbuf = p_new(char, plen = CHUNKSIZE);
   }
 
   if (fread (&ctb, 1, 1, fp) < 1) {
@@ -200,5 +199,5 @@ bail:
 void pgp_release_packet (void)
 {
   plen = 0;
-  mem_free (&pbuf);
+  p_delete(&pbuf);
 }