X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppacket.c;h=39ebdf25b2539d95a52cbb93bdd8dadf6b998ea9;hp=5da38b777afead4c8e2fc106ad111762a68f1c1c;hb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/pgppacket.c b/pgppacket.c
index 5da38b7..39ebdf2 100644
--- a/pgppacket.c
+++ b/pgppacket.c
@@ -17,7 +17,9 @@
 #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"
@@ -55,16 +57,15 @@ static int read_material (size_t material, size_t * used, FILE * fp)
 unsigned char *pgp_read_packet (FILE * fp, size_t * len)
 {
   size_t used = 0;
-  long startpos;
+  off_t startpos;
   unsigned char ctb;
   unsigned char b;
   size_t material;
 
-  startpos = ftell (fp);
+  startpos = ftello (fp);
 
   if (!plen) {
-    plen = CHUNKSIZE;
-    pbuf = safe_malloc (plen);
+    pbuf = p_new(char, plen = CHUNKSIZE);
   }
 
   if (fread (&ctb, 1, 1, fp) < 1) {
@@ -191,12 +192,12 @@ unsigned char *pgp_read_packet (FILE * fp, size_t * len)
 
 bail:
 
-  fseek (fp, startpos, SEEK_SET);
+  fseeko (fp, startpos, SEEK_SET);
   return NULL;
 }
 
 void pgp_release_packet (void)
 {
   plen = 0;
-  FREE (&pbuf);
+  p_delete(&pbuf);
 }