security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-11 13:14:25 +01:00
Code Activity

* keyedit.c (sign_uids): When making a self-signature via "sign" don't ask

Browse Source 
about sig level or expiration, and include the usual preferences and such
for v4 self-sigs.  (menu_set_preferences): Convert uids from UTF8 to
native before printing.
This commit is contained in:
David Shaw 2002-05-06 22:38:53 +00:00
parent 2dfec7107c
commit 4a214fbfbb
2 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,5 +1,10 @@
2002-05-06 David Shaw <dshaw@jabberwocky.com> 2002-05-06 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (sign_uids): When making a self-signature via "sign"
don't ask about sig level or expiration, and include the usual
preferences and such for v4 self-sigs. (menu_set_preferences):
Convert uids from UTF8 to native before printing.
* keyedit.c (sign_uids): Convert uids from UTF8 to native before * keyedit.c (sign_uids): Convert uids from UTF8 to native before
printing. (menu_set_primary_uid): Show error if the user tries to printing. (menu_set_primary_uid): Show error if the user tries to
make a uid with a v3 self-sig primary. make a uid with a v3 self-sig primary.

61
g10/keyedit.c
View File

@ -276,7 +276,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
KBNODE node, uidnode; KBNODE node, uidnode;
PKT_public_key *primary_pk=NULL; PKT_public_key *primary_pk=NULL;
int select_all = !count_selected_uids(keyblock); int select_all = !count_selected_uids(keyblock);
int force_v4=0, all_v3=1; int all_v3=1;
/* Are there any non-v3 sigs on this key already? */ /* Are there any non-v3 sigs on this key already? */
if(opt.pgp2) if(opt.pgp2)
@ -288,9 +288,6 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
break; break;
} }
if(local || nonrevocable || opt.cert_policy_url || opt.cert_notation_data)
force_v4=1;
/* build a list of all signators. /* build a list of all signators.
* *
* We use the CERT flag to request the primary which must always * We use the CERT flag to request the primary which must always
@ -304,12 +301,16 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
/* loop over all signators */ /* loop over all signators */
for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) { for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) {
u32 sk_keyid[2]; u32 sk_keyid[2],pk_keyid[2];
size_t n; size_t n;
char *p; char *p;
int class=0; int force_v4=0,class=0,selfsig=0;
u32 duration=0,timestamp=0; u32 duration=0,timestamp=0;
if(local || nonrevocable ||
opt.cert_policy_url || opt.cert_notation_data)
force_v4=1;
/* we have to use a copy of the sk, because make_keysig_packet /* we have to use a copy of the sk, because make_keysig_packet
* may remove the protection from sk and if we did other * may remove the protection from sk and if we did other
* changes to the secret key, we would save the unprotected * changes to the secret key, we would save the unprotected
@ -330,6 +331,11 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
for( node=keyblock; node; node = node->next ) { for( node=keyblock; node; node = node->next ) {
if( node->pkt->pkttype == PKT_PUBLIC_KEY ) { if( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
primary_pk=node->pkt->pkt.public_key; primary_pk=node->pkt->pkt.public_key;
keyid_from_pk( primary_pk, pk_keyid );
/* Is this a self-sig? */
if(pk_keyid[0]==sk_keyid[0] && pk_keyid[1]==sk_keyid[1])
selfsig=1;
} }
else if( node->pkt->pkttype == PKT_USER_ID ) { else if( node->pkt->pkttype == PKT_USER_ID ) {
uidnode = (node->flag & NODFLG_MARK_A)? node : NULL; uidnode = (node->flag & NODFLG_MARK_A)? node : NULL;
@ -422,7 +428,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
show_key_with_all_names( keyblock, 1, 0, 1, 0, 0 ); show_key_with_all_names( keyblock, 1, 0, 1, 0, 0 );
tty_printf("\n"); tty_printf("\n");
if(primary_pk->expiredate) if(primary_pk->expiredate && !selfsig)
{ {
u32 now=make_timestamp(); u32 now=make_timestamp();
@ -473,7 +479,7 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
/* Only ask for duration if we haven't already set it to match /* Only ask for duration if we haven't already set it to match
the expiration of the pk */ the expiration of the pk */
if(opt.ask_cert_expire && !duration) if(opt.ask_cert_expire && !duration && !selfsig)
duration=ask_expire_interval(1); duration=ask_expire_interval(1);
if(duration) if(duration)
@ -502,7 +508,9 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
continue; continue;
} }
if(opt.batch) if(selfsig)
;
else if(opt.batch)
class=0x10+opt.def_cert_check_level; class=0x10+opt.def_cert_check_level;
else else
{ {
@ -602,13 +610,22 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
* signatures, otherwise we would not generate the * signatures, otherwise we would not generate the
* subpacket with v3 keys and the signature becomes * subpacket with v3 keys and the signature becomes
* exportable */ * exportable */
rc = make_keysig_packet( &sig, primary_pk,
node->pkt->pkt.user_id, if(selfsig)
NULL, rc = make_keysig_packet( &sig, primary_pk,
sk, node->pkt->pkt.user_id,
class, 0, force_v4?4:0, NULL,
timestamp, duration, sk,
sign_mk_attrib, &attrib ); 0x13, 0, force_v4?4:0, 0, 0,
keygen_add_std_prefs, primary_pk);
else
rc = make_keysig_packet( &sig, primary_pk,
node->pkt->pkt.user_id,
NULL,
sk,
class, 0, force_v4?4:0,
timestamp, duration,
sign_mk_attrib, &attrib );
if( rc ) { if( rc ) {
log_error(_("signing failed: %s\n"), g10_errstr(rc)); log_error(_("signing failed: %s\n"), g10_errstr(rc));
goto leave; goto leave;
@ -2223,8 +2240,15 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
&& node->pkt->pkttype == PKT_SIGNATURE ) { && node->pkt->pkttype == PKT_SIGNATURE ) {
PKT_signature *sig = node->pkt->pkt.signature; PKT_signature *sig = node->pkt->pkt.signature;
if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
&& (uid && (sig->sig_class&~3) == 0x10) && (uid && (sig->sig_class&~3) == 0x10) ) {
&& sig->version >= 4 ) { if( sig->version < 4 ) {
char *user=utf8_to_native(uid->name,strlen(uid->name),0);
log_info(_("skipping v3 self-signature on user id \"%s\"\n"),
user);
m_free(user);
}
else {
/* This is a selfsignature which is to be replaced /* This is a selfsignature which is to be replaced
* We have to ignore v3 signatures because they are * We have to ignore v3 signatures because they are
* not able to carry the preferences */ * not able to carry the preferences */
@ -2251,6 +2275,7 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
m_free( node->pkt ); m_free( node->pkt );
node->pkt = newpkt; node->pkt = newpkt;
modified = 1; modified = 1;
}
} }
} }
} }