X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppubring.c;h=da1e4cd7d8002bda79ef0bfede72a97f9916efaa;hp=e797e9a0e3be3ed09dd5423899187a85d1bf2bc4;hb=207c707f2c7073a6fbd14124197a559d9d471f65;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/pgppubring.c b/pgppubring.c
index e797e9a..da1e4cd 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -28,6 +28,7 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
+#include <lib-hash/hash.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -44,8 +45,6 @@ extern int optind;
 
 short Umask;   /* dirty hack because we need Umask in lib.c but don't want globals.h there */
 
-#include "sha1.h"
-#include "md5.h"
 #include "lib.h"
 #include "pgplib.h"
 #include "pgppacket.h"
@@ -126,10 +125,10 @@ int main (int argc, char *const argv[])
   }
 
   if (_kring)
-    strfcpy (kring, _kring, sizeof (kring));
+    m_strcpy(kring, sizeof(kring), _kring);
   else {
     if ((env_pgppath = getenv ("PGPPATH")))
-      strfcpy (pgppath, env_pgppath, sizeof (pgppath));
+      m_strcpy(pgppath, sizeof(pgppath), env_pgppath);
     else if ((env_home = getenv ("HOME")))
       snprintf (pgppath, sizeof (pgppath), "%s/.pgp", env_home);
     else {
@@ -223,7 +222,7 @@ static pgp_key_t pgp_parse_pgp2_key (unsigned char *buff, size_t l)
     memcpy (p->fingerprint, digest, MD5_DIGEST_LENGTH);
   }
   else                          /* just to be usre */
-    memset (p->fingerprint, 0, MD5_DIGEST_LENGTH);
+    p_clear(p->fingerprint, MD5_DIGEST_LENGTH);
 
   expl = 0;
   for (i = 0; i < 2; i++)