gnupg/g10 (ChangeLog keyedit.c keygen.c)
cvs user dshaw
cvs at cvs.gnupg.org
Tue Dec 21 16:44:58 CET 2004
Date: Tuesday, December 21, 2004 @ 16:49:56
Author: dshaw
Path: /cvs/gnupg/gnupg/g10
Modified: ChangeLog keyedit.c keygen.c
* 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.
-----------+
ChangeLog | 8 ++++++++
keyedit.c | 3 ++-
keygen.c | 7 ++++---
3 files changed, 14 insertions(+), 4 deletions(-)
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.668 gnupg/g10/ChangeLog:1.669
--- gnupg/g10/ChangeLog:1.668 Tue Dec 21 05:19:03 2004
+++ gnupg/g10/ChangeLog Tue Dec 21 16:49:56 2004
@@ -1,3 +1,11 @@
+2004-12-21 David Shaw <dshaw at 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 at jabberwocky.com>
* keylist.c (list_keyblock_print): Secret key listings should
Index: gnupg/g10/keyedit.c
diff -u gnupg/g10/keyedit.c:1.165 gnupg/g10/keyedit.c:1.166
--- gnupg/g10/keyedit.c:1.165 Tue Dec 21 05:19:03 2004
+++ gnupg/g10/keyedit.c Tue Dec 21 16:49:56 2004
@@ -3558,7 +3558,8 @@
{
PKT_signature *sig = node->pkt->pkt.signature;
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);
if( sig->version < 4 )
Index: gnupg/g10/keygen.c
diff -u gnupg/g10/keygen.c:1.140 gnupg/g10/keygen.c:1.141
--- gnupg/g10/keygen.c:1.140 Mon Dec 20 19:14:57 2004
+++ gnupg/g10/keygen.c Tue Dec 21 16:49:56 2004
@@ -1569,12 +1569,13 @@
continue;
}
- if( !valid_days ) {
+ if( !valid_days )
+ {
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"));
interval = 0;
- }
+ }
else {
interval = valid_days * 86400L;
More information about the Gnupg-commits
mailing list