wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 888778 via svnmerge from

Browse Source 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r888778 | mutz | 2008-11-25 12:34:08 +0100 (Tue, 25 Nov 2008) | 13 lines
  
  Merged revisions 888513-888760 via svnmerge from 
  svn+ssh://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r888513 | mutz | 2008-11-24 18:59:11 +0100 (Mon, 24 Nov 2008) | 1 line
    
    Warn not only if the key is about to expire, but also if it has already expired. Fixes kolab/issue3195.
  ........
    r888760 | mutz | 2008-11-25 11:52:10 +0100 (Tue, 25 Nov 2008) | 1 line
    
    Only remember the key as being warned for if we already warned for it. Fixes kolab/issue3265.
  ........
................

svn path=/trunk/KDE/kdepim/; revision=907360
wilder-work
Thomas McGuire 17 years ago
parent 54717bd1a5
commit 01cf204954
1 changed files with 97 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      keyresolver.cpp

100
keyresolver.cpp
Unescape View File

@ -552,13 +552,105 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
const GpgME::Subkey subkey = key.subkey(0);
if ( d->alreadyWarnedFingerprints.count( subkey.fingerprint() ) )
return Kpgp::Ok; // already warned about this one (and so about it's issuers)
d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
if ( subkey.neverExpires() )
return Kpgp::Ok;
static const double secsPerDay = 24 * 60 * 60;
const int daysTillExpiry =
1 + int( ::difftime( subkey.expirationTime(), time(0) ) / secsPerDay );
const double secsTillExpiry = ::difftime( subkey.expirationTime(), time(0) );
if ( secsTillExpiry <= 0 ) {
const int daysSinceExpiry = 1 + int( -secsTillExpiry / secsPerDay );
kDebug(5006) << "Key 0x" << key.shortKeyID() << " expired less than "
<< daysSinceExpiry << " days ago";
const QString msg =
key.protocol() == GpgME::OpenPGP
? ( mine ? sign
? ki18np("<p>Your OpenPGP signing key</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
"<p>expired less than a day ago.</p>",
"<p>Your OpenPGP signing key</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
"<p>expired %1 days ago.</p>")
: ki18np("<p>Your OpenPGP encryption key</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
"<p>expired less than a day ago.</p>",
"<p>Your OpenPGP encryption key</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
"<p>expired %1 days ago.</p>")
: ki18np("<p>The OpenPGP key for</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
"<p>expired less than a day ago.</p>",
"<p>The OpenPGP key for</p><p align=center><b>%2</b> (KeyID 0x%3)</p>"
"<p>expired %1 days ago.</p>") )
.subs( daysSinceExpiry )
.subs( QString::fromUtf8( key.userID(0).id() ) )
.subs( key.shortKeyID() )
.toString()
: ( ca
? ( key.isRoot()
? ( mine ? sign
? ki18np("<p>The root certificate</p><p align=center><b>%4</b></p>"
"<p>for your S/MIME signing certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired less than a day ago.</p>",
"<p>The root certificate</p><p align=center><b>%4</b></p>"
"<p>for your S/MIME signing certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired %1 days ago.</p>")
: ki18np("<p>The root certificate</p><p align=center><b>%4</b></p>"
"<p>for your S/MIME encryption certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired less than a day ago.</p>",
"<p>The root certificate</p><p align=center><b>%4</b></p>"
"<p>for your S/MIME encryption certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired %1 days ago.</p>")
: ki18np("<p>The root certificate</p><p align=center><b>%4</b></p>"
"<p>for S/MIME certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired less than a day ago.</p>",
"<p>The root certificate</p><p align=center><b>%4</b></p>"
"<p>for S/MIME certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired %1 days ago.</p>") )
: ( mine ? sign
? ki18np("<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
"<p>for your S/MIME signing certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired less than a day ago.</p>",
"<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
"<p>for your S/MIME signing certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired %1 days ago.</p>")
: ki18np("<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
"<p>for your S/MIME encryption certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired less than a day ago.</p>",
"<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
"<p>for your S/MIME encryption certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired %1 days ago.</p>")
: ki18np("<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
"<p>for S/MIME certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired less than a day ago.</p>",
"<p>The intermediate CA certificate</p><p align=center><b>%4</b></p>"
"<p>for S/MIME certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired %1 days ago.</p>") ) )
.subs( daysSinceExpiry )
.subs( Kleo::DN( orig.userID(0).id() ).prettyDN() )
.subs( orig.issuerSerial() )
.subs( Kleo::DN( key.userID(0).id() ).prettyDN() )
.toString()
: ( mine ? sign
? ki18np("<p>Your S/MIME signing certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired less than a day ago.</p>",
"<p>Your S/MIME signing certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired %1 days ago.</p>")
: ki18np("<p>Your S/MIME encryption certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired less than a day ago.</p>",
"<p>Your S/MIME encryption certificate</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired %1 days ago.</p>")
: ki18np("<p>The S/MIME certificate for</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired less than a day ago.</p>",
"<p>The S/MIME certificate for</p><p align=center><b>%2</b> (serial number %3)</p>"
"<p>expired %1 days ago.</p>" ) )
.subs( daysSinceExpiry )
.subs( Kleo::DN( key.userID(0).id() ).prettyDN() )
.subs( key.issuerSerial() )
.toString() );
d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
if ( KMessageBox::warningContinueCancel( 0, msg,
key.protocol() == GpgME::OpenPGP
? i18n("OpenPGP Key Expired" )
: i18n("S/MIME Certificate Expired" ),
KStandardGuiItem::cont(), KStandardGuiItem::cancel(), dontAskAgainName ) == KMessageBox::Cancel )
return Kpgp::Canceled;
} else {
const int daysTillExpiry = 1 + int( secsTillExpiry / secsPerDay );
kDebug(5006) <<"Key 0x" << key.shortKeyID() <<"expires in less than"
<< daysTillExpiry << "days";
const int threshold =
@ -655,6 +747,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
.subs( Kleo::DN( key.userID(0).id() ).prettyDN() )
.subs( key.issuerSerial() )
.toString() );
d->alreadyWarnedFingerprints.insert( subkey.fingerprint() );
if ( KMessageBox::warningContinueCancel( 0, msg,
key.protocol() == GpgME::OpenPGP
? i18n("OpenPGP Key Expires Soon" )
@ -664,6 +757,7 @@ Kpgp::Result Kleo::KeyResolver::checkKeyNearExpiry( const GpgME::Key & key, cons
== KMessageBox::Cancel )
return Kpgp::Canceled;
}
}
if ( key.isRoot() )
return Kpgp::Ok;
else if ( const char * chain_id = key.chainID() ) {

Write Preview
Loading…
Cancel
Save