security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

* packet.h, sign.c (update_keysig_packet), keyedit.c

Browse Source 
(menu_set_primary_uid, menu_set_preferences): Add ability to issue 0x18
subkey binding sigs to update_keysig_packet and change all callers.
This commit is contained in:
David Shaw 2002-12-04 16:17:21 +00:00
parent dc70beb88f
commit 6d30580362
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2002-12-04 David Shaw <dshaw@jabberwocky.com>
* 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.
2002-12-03 David Shaw <dshaw@jabberwocky.com> 2002-12-03 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c (main), encode.c (write_pubkey_enc_from_list), * options.h, g10.c (main), encode.c (write_pubkey_enc_from_list),

4
g10/keyedit.c
View File

@ -2684,7 +2684,7 @@ menu_set_primary_uid ( KBNODE pub_keyblock, KBNODE sec_keyblock )
if (action) { if (action) {
int rc = update_keysig_packet (&newsig, sig, int rc = update_keysig_packet (&newsig, sig,
main_pk, uid, main_pk, uid, NULL,
sk, sk,
change_primary_uid_cb, change_primary_uid_cb,
action > 0? "x":NULL ); action > 0? "x":NULL );
@ -2769,7 +2769,7 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
int rc; int rc;
rc = update_keysig_packet (&newsig, sig, rc = update_keysig_packet (&newsig, sig,
main_pk, uid, main_pk, uid, NULL,
sk, sk,
keygen_upd_std_prefs, keygen_upd_std_prefs,
NULL ); NULL );

1
g10/packet.h
View File

@ -484,6 +484,7 @@ int update_keysig_packet( PKT_signature **ret_sig,
PKT_signature *orig_sig, PKT_signature *orig_sig,
PKT_public_key *pk, PKT_public_key *pk,
PKT_user_id *uid, PKT_user_id *uid,
PKT_public_key *subpk,
PKT_secret_key *sk, PKT_secret_key *sk,
int (*mksubpkt)(PKT_signature *, void *), int (*mksubpkt)(PKT_signature *, void *),
void *opaque ); void *opaque );

7
g10/sign.c
View File

@ -1249,6 +1249,7 @@ update_keysig_packet( PKT_signature **ret_sig,
PKT_signature *orig_sig, PKT_signature *orig_sig,
PKT_public_key *pk, PKT_public_key *pk,
PKT_user_id *uid, PKT_user_id *uid,
PKT_public_key *subpk,
PKT_secret_key *sk, PKT_secret_key *sk,
int (*mksubpkt)(PKT_signature *, void *), int (*mksubpkt)(PKT_signature *, void *),
void *opaque void *opaque
@ -1258,9 +1259,9 @@ update_keysig_packet( PKT_signature **ret_sig,
int rc=0; int rc=0;
MD_HANDLE md; MD_HANDLE md;
if (!orig_sig || !pk || !uid || !sk) if ((!orig_sig || !pk || !sk)
return G10ERR_GENERAL; || (orig_sig->sig_class >= 0x10 && orig_sig->sig_class <= 0x13 && !uid)
if (orig_sig->sig_class < 0x10 || orig_sig->sig_class > 0x13 ) || (orig_sig->sig_class == 0x18 && !subpk))
return G10ERR_GENERAL; return G10ERR_GENERAL;
md = md_open( orig_sig->digest_algo, 0 ); md = md_open( orig_sig->digest_algo, 0 );