#include <lib-lib/mem.h>
#include <lib-lib/str.h>
+#include <lib-hash/hash.h>
#include <stdio.h>
#include <stdlib.h>
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
}
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 {
return 1;
for (i = 0; i < nhints; i++) {
- if (str_isstr (s, hints[i]) != NULL)
+ if (m_stristr(s, hints[i]) != NULL)
return 1;
}