projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgotten debug
[apps/madmutt.git]
/
pgpkey.c
diff --git
a/pgpkey.c
b/pgpkey.c
index
425289e
..
a14ec77
100644
(file)
--- a/
pgpkey.c
+++ b/
pgpkey.c
@@
-401,7
+401,7
@@
static int pgp_id_is_valid (pgp_uid_t * uid)
#define PGP_KV_MATCH (PGP_KV_ADDR|PGP_KV_STRING)
#define PGP_KV_MATCH (PGP_KV_ADDR|PGP_KV_STRING)
-static int pgp_id_matches_addr (
ADDRESS * addr, ADDRESS
* u_addr,
+static int pgp_id_matches_addr (
address_t * addr, address_t
* u_addr,
pgp_uid_t * uid)
{
int rv = 0;
pgp_uid_t * uid)
{
int rv = 0;
@@
-423,7
+423,7
@@
static int pgp_id_matches_addr (ADDRESS * addr, ADDRESS * u_addr,
return rv;
}
return rv;
}
-static pgp_key_t pgp_select_key (pgp_key_t keys,
ADDRESS
* p, const char *s)
+static pgp_key_t pgp_select_key (pgp_key_t keys,
address_t
* p, const char *s)
{
int keymax;
pgp_uid_t **KeyTable;
{
int keymax;
pgp_uid_t **KeyTable;
@@
-786,9
+786,9
@@
static pgp_key_t *pgp_get_lastp (pgp_key_t p)
return NULL;
}
return NULL;
}
-pgp_key_t pgp_getkeybyaddr (
ADDRESS
* a, short abilities, pgp_ring_t keyring)
+pgp_key_t pgp_getkeybyaddr (
address_t
* a, short abilities, pgp_ring_t keyring)
{
{
-
ADDRESS
*r, *p;
+
address_t
*r, *p;
LIST *hints = NULL;
int weak = 0;
LIST *hints = NULL;
int weak = 0;
@@
-861,7
+861,7
@@
pgp_key_t pgp_getkeybyaddr (ADDRESS * a, short abilities, pgp_ring_t keyring)
this_key_has_weak = 1;
}
this_key_has_weak = 1;
}
-
rfc822_free_address
(&r);
+
address_delete
(&r);
}
if (match && !this_key_has_strong && this_key_has_invalid)
}
if (match && !this_key_has_strong && this_key_has_invalid)