diff options
| author | Werner Koch <wk@gnupg.org> | 2016-01-18 11:35:26 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-01-18 11:35:26 +0100 |
| commit | 9309bda9581715d304305c8c5116f2cbb31aec77 (patch) | |
| tree | 56c25951206079fa2958540558a537f55f44bc1c /g10/sig-check.c | |
| parent | Use ngettext for some strings. (diff) | |
| download | gnupg2-9309bda9581715d304305c8c5116f2cbb31aec77.tar.xz gnupg2-9309bda9581715d304305c8c5116f2cbb31aec77.zip | |
gpg: Use "days" in "...newer than..." diagnostics.
* g10/sig-check.c (check_signature_metadata_validity): Use days if
useful.
--
Using days instead of a high number of seconds is for the majority of
users a better measurement.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/sig-check.c')
| -rw-r--r-- | g10/sig-check.c | 45 |
1 files changed, 35 insertions, 10 deletions
diff --git a/g10/sig-check.c b/g10/sig-check.c index 8f976ba7a..292adb96f 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -268,10 +268,23 @@ check_signature_metadata_validity (PKT_public_key *pk, PKT_signature *sig, if( pk->timestamp > sig->timestamp ) { ulong d = pk->timestamp - sig->timestamp; - log_info - (ngettext("public key %s is %lu second newer than the signature\n", - "public key %s is %lu seconds newer than the signature\n", - d), keystr_from_pk (pk), d); + if ( d < 86400 ) + { + log_info + (ngettext + ("public key %s is %lu second newer than the signature\n", + "public key %s is %lu seconds newer than the signature\n", + d), keystr_from_pk (pk), d); + } + else + { + d /= 86400; + log_info + (ngettext + ("public key %s is %lu day newer than the signature\n", + "public key %s is %lu days newer than the signature\n", + d), keystr_from_pk (pk), d); + } if (!opt.ignore_time_conflict) return GPG_ERR_TIME_CONFLICT; /* pubkey newer than signature. */ } @@ -280,12 +293,24 @@ check_signature_metadata_validity (PKT_public_key *pk, PKT_signature *sig, if( pk->timestamp > cur_time ) { ulong d = pk->timestamp - cur_time; - log_info (ngettext("key %s was created %lu second" - " in the future (time warp or clock problem)\n", - "key %s was created %lu seconds" - " in the future (time warp or clock problem)\n", - d), keystr_from_pk (pk), d); - if( !opt.ignore_time_conflict ) + if (d < 86400) + { + log_info (ngettext("key %s was created %lu second" + " in the future (time warp or clock problem)\n", + "key %s was created %lu seconds" + " in the future (time warp or clock problem)\n", + d), keystr_from_pk (pk), d); + } + else + { + d /= 86400; + log_info (ngettext("key %s was created %lu day" + " in the future (time warp or clock problem)\n", + "key %s was created %lu days" + " in the future (time warp or clock problem)\n", + d), keystr_from_pk (pk), d); + } + if (!opt.ignore_time_conflict) return GPG_ERR_TIME_CONFLICT; } |