X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppubring.c;h=7b297edcea69599ea40ee02752701a72ff62be55;hp=93612049656cead8e99fb41951193b706d044591;hb=2a2f2f9a5bad73c883b7f9c9b4166d932b6aaf37;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/pgppubring.c b/pgppubring.c
index 9361204..7b297ed 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,11 +45,9 @@ 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"
+#include <lib-crypt/pgplib.h>
+#include <lib-crypt/pgppacket.h>
 
 #define MD5_DIGEST_LENGTH  16
 
@@ -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 {
@@ -707,7 +706,7 @@ static int pgpring_string_matches_hint (const char *s, const char *hints[],
     return 1;
 
   for (i = 0; i < nhints; i++) {
-    if (str_isstr (s, hints[i]) != NULL)
+    if (m_stristr(s, hints[i]) != NULL)
       return 1;
   }