#endif
#include <lib-lib/mem.h>
-
-#include "lib/str.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"
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++)
"%08lX", id);
}
- p->keyid = str_dup ((char *) scratch);
+ p->keyid = m_strdup((char *) scratch);
return p;
id);
}
- p->keyid = str_dup ((char *) scratch);
+ p->keyid = m_strdup((char *) scratch);
return p;
}
char *error_buf;
size_t error_buf_len;
- error_buf_len = sizeof ("fopen: ") - 1 + str_len (ringfile) + 1;
+ error_buf_len = sizeof ("fopen: ") - 1 + m_strlen(ringfile) + 1;
error_buf = p_new(char, error_buf_len);
snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
perror (error_buf);