summaryrefslogtreecommitdiffstats
path: root/g10/keygen.c
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2004-12-21 16:49:56 +0100
committerDavid Shaw <dshaw@jabberwocky.com>2004-12-21 16:49:56 +0100
commitb883e9642b0f83e702c5dd73ed0133ffbaa06330 (patch)
treee74c10f22ba1909bd043b3141bcafe1985addd13 /g10/keygen.c
parent* keylist.c (list_keyblock_print): Secret key listings should always show (diff)
downloadgnupg2-b883e9642b0f83e702c5dd73ed0133ffbaa06330.tar.xz
gnupg2-b883e9642b0f83e702c5dd73ed0133ffbaa06330.zip
* 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.
Diffstat (limited to 'g10/keygen.c')
-rw-r--r--g10/keygen.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/g10/keygen.c b/g10/keygen.c
index c9965c2ba..000454eb9 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1569,12 +1569,13 @@ ask_expire_interval(int object)
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;