diff options
| author | David Shaw <[email protected]> | 2002-12-29 15:58:44 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-12-29 15:58:44 +0000 |
| commit | 0bb73ee428a257f4acc35c1087ae871cee8437b8 (patch) | |
| tree | 5d0a20833e404ee84e56b19d5fa83b07b8fa732f /g10/main.h | |
| parent | * keyserver.c (keyserver_refresh): Don't print the "refreshing..." line if (diff) | |
| download | gnupg-0bb73ee428a257f4acc35c1087ae871cee8437b8.tar.gz gnupg-0bb73ee428a257f4acc35c1087ae871cee8437b8.zip | |
* getkey.c (merge_selfsigs_main), main.h, sig-check.c
(check_key_signature2): Pass the ultimately trusted pk directly to
check_key_signature2 to avoid going through the key selection mechanism.
This prevents a deadly embrace when two keys without selfsigs each sign
the other.
Diffstat (limited to '')
| -rw-r--r-- | g10/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/main.h b/g10/main.h index 03d43e112..418653460 100644 --- a/g10/main.h +++ b/g10/main.h @@ -113,7 +113,7 @@ int sign_symencrypt_file (const char *fname, STRLIST locusr); /*-- sig-check.c --*/ int check_revocation_keys (PKT_public_key *pk, PKT_signature *sig); int check_key_signature( KBNODE root, KBNODE node, int *is_selfsig ); -int check_key_signature2( KBNODE root, KBNODE node, +int check_key_signature2( KBNODE root, KBNODE node, PKT_public_key *check_pk, int *is_selfsig, u32 *r_expiredate, int *r_expired ); /*-- delkey.c --*/ |