aboutsummaryrefslogtreecommitdiffstats
path: root/g10/packet.h
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2002-12-04 18:50:10 +0000
committerDavid Shaw <[email protected]>2002-12-04 18:50:10 +0000
commit1aec20776c0568c71aac299feb5519facc80348f (patch)
tree4ddfa6ae507218ab20ac09175b8604859b0fcbc9 /g10/packet.h
parent* trustdb.c (validate_keys): Show trust parameters when building trustdb, (diff)
downloadgnupg-1aec20776c0568c71aac299feb5519facc80348f.tar.gz
gnupg-1aec20776c0568c71aac299feb5519facc80348f.zip
* main.h, keyedit.c, keygen.c: Back out previous (2002-12-01) change.
Minimal isn't always best. * sign.c (update_keysig_packet): Use the current time rather then a modification of the original signature time. Make sure that this doesn't cause a time warp. * keygen.c (keygen_add_key_expire): Properly handle a key expiration date in the past (use a duration of 0). * keyedit.c (menu_expire): Use update_keysig_packet so any sig subpackets are maintained during the update. * build-packet.c (build_sig_subpkt): Mark sig expired or unexpired when the sig expiration subpacket is added. (build_sig_subpkt_from_sig): Handle making an expiration subpacket from a sig that has already expired (use a duration of 0). * packet.h, sign.c (update_keysig_packet), keyedit.c (menu_set_primary_uid, menu_set_preferences): Add ability to issue 0x18 subkey binding sigs to update_keysig_packet and change all callers.
Diffstat (limited to '')
-rw-r--r--g10/packet.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/packet.h b/g10/packet.h
index c3dc0c7ab..00b7d2b14 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -490,7 +490,8 @@ int make_keysig_packet( PKT_signature **ret_sig, PKT_public_key *pk,
int update_keysig_packet( PKT_signature **ret_sig,
PKT_signature *orig_sig,
PKT_public_key *pk,
- PKT_user_id *uid,
+ PKT_user_id *uid,
+ PKT_public_key *subpk,
PKT_secret_key *sk,
int (*mksubpkt)(PKT_signature *, void *),
void *opaque );