diff options
| author | Neal H. Walfield <[email protected]> | 2016-11-23 11:29:22 +0000 |
|---|---|---|
| committer | Neal H. Walfield <[email protected]> | 2016-11-23 11:29:22 +0000 |
| commit | 03a65a53231cc3132a50a1871e81a512c44da169 (patch) | |
| tree | 5df81cf4f7fbeaeb24801c5acebd6ce3160e2adf /g10/keylist.c | |
| parent | g10: Use es_fopen instead of open. (diff) | |
| download | gnupg-03a65a53231cc3132a50a1871e81a512c44da169.tar.gz gnupg-03a65a53231cc3132a50a1871e81a512c44da169.zip | |
g10: Avoid gratuitously loading a keyblock when it is already available
* g10/trust.c (get_validity): Add new, optional parameter KB. Only
load the keyblock if KB is NULL. Update callers.
(get_validity): Likewise.
* g10/trustdb.c (tdb_get_validity_core): Likewise.
--
Signed-off-by: Neal H. Walfield <[email protected]>
GnuPG-bug-id: 2812
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index 0523be090..a5fdc06a8 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -1228,7 +1228,7 @@ list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock, trustletter_print = 0; else { - trustletter = get_validity_info (ctrl, pk, NULL); + trustletter = get_validity_info (ctrl, keyblock, pk, NULL); if (trustletter == 'u') ulti_hack = 1; trustletter_print = trustletter; @@ -1309,7 +1309,7 @@ list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock, else if (ulti_hack) uid_validity = 'u'; else - uid_validity = get_validity_info (ctrl, pk, uid); + uid_validity = get_validity_info (ctrl, keyblock, pk, uid); es_fputs (uid->attrib_data? "uat:":"uid:", es_stdout); if (uid_validity) |