[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/certmanager/lib
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-06-05 14:32:55
Message-ID: 20040605143255.BF636126F0 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Allow to filter on isRoot(), too, and add an filter that uses this as an example to libkleopatrarc


  M +12 -0     libkleopatrarc.desktop   1.13
  M +3 -2      kleo/kconfigbasedkeyfilter.cpp   1.4
  M +1 -0      kleo/kconfigbasedkeyfilter.h   1.4


--- kdepim/certmanager/lib/libkleopatrarc.desktop  #1.12:1.13
@@ -44,4 +44,16 @@
 [Key Filter #3]
 was-validated=true
+is-root-certificate=true
+is-validity=ultimate
+Name=Trusted root certificate
+
+[Key Filter #4]
+was-validated=true
+is-root-certificate=true
+is-not-validity=ultimate
+Name=Not trusted root certificate
+
+[Key Filter #5]
+was-validated=true
 Name=Other keys
 Name[be]=Іншыя ключы

--- kdepim/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp  #1.3:1.4
@@ -78,4 +78,5 @@ Kleo::KConfigBasedKeyFilter::KConfigBase
     mExpired( DoesNotMatter ),
     mDisabled( DoesNotMatter ),
+    mRoot( DoesNotMatter ),
     mCanEncrypt( DoesNotMatter ),
     mCanSign( DoesNotMatter ),
@@ -113,4 +114,5 @@ Kleo::KConfigBasedKeyFilter::KConfigBase
   SET( mExpired, "is-expired" );
   SET( mDisabled, "is-disabled" );
+  SET( mRoot, "is-root-certificate" );
   SET( mCanEncrypt, "can-encrypt" );
   SET( mCanSign, "can-sign" );
@@ -166,4 +168,5 @@ bool Kleo::KConfigBasedKeyFilter::matche
   IS_MATCH( Expired );
   IS_MATCH( Disabled );
+  IS_MATCH( Root );
   CAN_MATCH( Encrypt );
   CAN_MATCH( Sign );
@@ -178,6 +181,4 @@ bool Kleo::KConfigBasedKeyFilter::matche
        bool( key.keyListMode() & GpgME::Context::Validate ) != bool( mWasValidated == Set ) )
     return false;
-  if ( key.protocol() == GpgME::Context::CMS )
-    return true; // X.509 doesn't have validity and ownertrust
   switch ( mOwnerTrust ) {
   default:

--- kdepim/certmanager/lib/kleo/kconfigbasedkeyfilter.h  #1.3:1.4
@@ -79,4 +79,5 @@ namespace Kleo {
     TriState mExpired;
     TriState mDisabled;
+    TriState mRoot;
     TriState mCanEncrypt;
     TriState mCanSign;


[prev in list] [next in list] [prev in thread] [next in thread]