security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* plaintext.c (handle_plaintext): Accept 'u' as a plaintext mode that

Browse source 
requires end of line conversion.  This is being considered for a UTF8 text
packet.  If this doesn't take place, no major harm done.  If it does take
place, we'll get a jump on starting the changeover.

* g10.c (main): --no-use-embedded-filename.

* build-packet.c (calc_plaintext, do_plaintext): Do not create illegal
(packet header indicates a size larger than the actual packet) encrypted
data packets when not compressing and using a filename longer than 255
characters.

* keyedit.c (no_primary_warning): Cleanup. (menu_expire): Don't give
primary warning for subkey expiration changes.  These cannot reorder
primaries.
This commit is contained in:
David Shaw 2004-04-16 16:31:19 +00:00
parent 4420275b83
commit d49a7e1a7a
5 changed files with 46 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
g10/keyedit.c
View file

@ -2290,13 +2290,10 @@ show_key_and_fingerprint( KBNODE keyblock )
/* Show a warning if no uids on the key have the primary uid flag
set. */
static void
no_primary_warning(KBNODE keyblock, int uids)
no_primary_warning(KBNODE keyblock)
{
KBNODE node;
int select_all=1,have_uid=0,uid_count=0;
if(uids)
select_all=!count_selected_uids(keyblock);
int have_primary=0,uid_count=0;
/* TODO: if we ever start behaving differently with a primary or
non-primary attribute ID, we will need to check for attributes
@ -2309,17 +2306,18 @@ no_primary_warning(KBNODE keyblock, int uids)
{
uid_count++;
if((select_all || (node->flag & NODFLG_SELUID))
&& node->pkt->pkt.user_id->is_primary==2)
have_uid|=2;
else
have_uid|=1;
if(node->pkt->pkt.user_id->is_primary==2)
{
have_primary=1;
break;
}
}
}
if(uid_count>1 && have_uid&1 && !(have_uid&2))
log_info(_("WARNING: no user ID has been marked as primary. This command "
"may\n cause a different user ID to become the assumed primary.\n"));
if(uid_count>1 && !have_primary)
log_info(_("WARNING: no user ID has been marked as primary. This command"
" may\n cause a different user ID to become"
" the assumed primary.\n"));
}
/****************
@ -2838,12 +2836,12 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
}
else if( n1 )
tty_printf(_("Changing expiration time for a secondary key.\n"));
else {
else
{
tty_printf(_("Changing expiration time for the primary key.\n"));
mainkey=1;
}
no_primary_warning(pub_keyblock,0);
no_primary_warning(pub_keyblock);
}
expiredate = ask_expiredate();
node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
@ -3099,7 +3097,7 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
int selected, select_all;
int modified = 0;
no_primary_warning(pub_keyblock,1);
no_primary_warning(pub_keyblock);
select_all = !count_selected_uids (pub_keyblock);
@ -3184,7 +3182,7 @@ menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock )
int modified = 0;
char *answer;
no_primary_warning(pub_keyblock,1);
no_primary_warning(pub_keyblock);
answer=cpr_get_utf8("keyedit.add_keyserver",
_("Enter your preferred keyserver URL: "));