security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

* keyedit.c (menu_set_keyserver_url): Make sure we only operate on the

Browse Source 
chosen selfsig so we don't accidentally promote an older selfsig to
chosen.  Discovered by Simon Josefsson and 'Todd'.

* keygen.c (ask_expire_interval): Fix typo.
This commit is contained in:
David Shaw 2004-12-21 15:49:56 +00:00
parent 8dcbbf98bb
commit b883e9642b
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2004-12-21 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (menu_set_keyserver_url): Make sure we only operate on
the chosen selfsig so we don't accidentally promote an older
selfsig to chosen. Discovered by Simon Josefsson and 'Todd'.
* keygen.c (ask_expire_interval): Fix typo.
2004-12-20 David Shaw <dshaw@jabberwocky.com> 2004-12-20 David Shaw <dshaw@jabberwocky.com>
* keylist.c (list_keyblock_print): Secret key listings should * keylist.c (list_keyblock_print): Secret key listings should

3
g10/keyedit.c
View File

@ -3558,7 +3558,8 @@ menu_set_keyserver_url (const char *url,
{ {
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->flags.chosen_selfsig)
{ {
char *user=utf8_to_native(uid->name,strlen(uid->name),0); char *user=utf8_to_native(uid->name,strlen(uid->name),0);
if( sig->version < 4 ) if( sig->version < 4 )

7
g10/keygen.c
View File

@ -1569,12 +1569,13 @@ ask_expire_interval(int object)
continue; continue;
} }
if( !valid_days ) { if( !valid_days )
{
tty_printf((object==0) tty_printf((object==0)
? _("Key does not expire at all\n") : ? _("Key does not expire at all\n")
: _("Signature does not expire at all\n")); : _("Signature does not expire at all\n"));
interval = 0; interval = 0;
} }
else { else {
interval = valid_days * 86400L; interval = valid_days * 86400L;