projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use signed size parameter in quote_entry()
[apps/madmutt.git]
/
pgppubring.c
diff --git
a/pgppubring.c
b/pgppubring.c
index
20b4b92
..
7b297ed
100644
(file)
--- a/
pgppubring.c
+++ b/
pgppubring.c
@@
-27,9
+27,8
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
-
-#include "lib/mem.h"
-#include "lib/str.h"
+#include <lib-lib/str.h>
+#include <lib-hash/hash.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-46,11
+45,9
@@
extern int optind;
short Umask; /* dirty hack because we need Umask in lib.c but don't want globals.h there */
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 "lib.h"
-#include
"pgplib.h"
-#include
"pgppacket.h"
+#include
<lib-crypt/pgplib.h>
+#include
<lib-crypt/pgppacket.h>
#define MD5_DIGEST_LENGTH 16
#define MD5_DIGEST_LENGTH 16
@@
-128,10
+125,10
@@
int main (int argc, char *const argv[])
}
if (_kring)
}
if (_kring)
-
strfcpy (kring, _kring, sizeof (kring)
);
+
m_strcpy(kring, sizeof(kring), _kring
);
else {
if ((env_pgppath = getenv ("PGPPATH")))
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 {
else if ((env_home = getenv ("HOME")))
snprintf (pgppath, sizeof (pgppath), "%s/.pgp", env_home);
else {
@@
-225,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 */
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++)
expl = 0;
for (i = 0; i < 2; i++)
@@
-248,7
+245,7
@@
static pgp_key_t pgp_parse_pgp2_key (unsigned char *buff, size_t l)
"%08lX", id);
}
"%08lX", id);
}
- p->keyid =
str_dup
((char *) scratch);
+ p->keyid =
m_strdup
((char *) scratch);
return p;
return p;
@@
-350,7
+347,7
@@
static pgp_key_t pgp_parse_pgp3_key (unsigned char *buff, size_t l)
id);
}
id);
}
- p->keyid =
str_dup
((char *) scratch);
+ p->keyid =
m_strdup
((char *) scratch);
return p;
}
return p;
}
@@
-709,7
+706,7
@@
static int pgpring_string_matches_hint (const char *s, const char *hints[],
return 1;
for (i = 0; i < nhints; i++) {
return 1;
for (i = 0; i < nhints; i++) {
- if (
str_isstr
(s, hints[i]) != NULL)
+ if (
m_stristr
(s, hints[i]) != NULL)
return 1;
}
return 1;
}
@@
-742,7
+739,7
@@
static void pgpring_find_candidates (char *ringfile, const char *hints[],
char *error_buf;
size_t error_buf_len;
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);
error_buf = p_new(char, error_buf_len);
snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
perror (error_buf);