From 3324d59c9821f85a13e1635626fdcfce3140cdfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
Date: Thu, 5 Nov 2020 12:29:06 +0100
Subject: [PATCH] Add possibility to filter out invalid keys

---
 src/kleo/defaultkeyfilter.cpp | 13 +++++++++++++
 src/kleo/defaultkeyfilter.h   |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/src/kleo/defaultkeyfilter.cpp b/src/kleo/defaultkeyfilter.cpp
index dd838a8..a0e3500 100644
--- a/src/kleo/defaultkeyfilter.cpp
+++ b/src/kleo/defaultkeyfilter.cpp
@@ -35,6 +35,7 @@ public:
         mMatchContexts(AnyMatchContext),
         mRevoked(DoesNotMatter),
         mExpired(DoesNotMatter),
+        mInvalid(DoesNotMatter),
         mDisabled(DoesNotMatter),
         mRoot(DoesNotMatter),
         mCanEncrypt(DoesNotMatter),
@@ -67,6 +68,7 @@ public:
 
     TriState mRevoked;
     TriState mExpired;
+    TriState mInvalid;
     TriState mDisabled;
     TriState mRoot;
     TriState mCanEncrypt;
@@ -111,6 +113,7 @@ bool DefaultKeyFilter::matches(const Key &key, MatchContexts contexts) const
 #define CAN_MATCH(what) MATCH( d_ptr->mCan##what, can##what )
     IS_MATCH(Revoked);
     IS_MATCH(Expired);
+    IS_MATCH(Invalid);
     IS_MATCH(Disabled);
     IS_MATCH(Root);
     CAN_MATCH(Encrypt);
@@ -275,6 +278,11 @@ void DefaultKeyFilter::setExpired(DefaultKeyFilter::TriState value) const
     d_ptr->mExpired = value;
 }
 
+void DefaultKeyFilter::setInvalid(DefaultKeyFilter::TriState value) const
+{
+    d_ptr->mInvalid = value;
+}
+
 void DefaultKeyFilter::setDisabled(DefaultKeyFilter::TriState value) const
 {
     d_ptr->mDisabled = value;
@@ -430,6 +438,11 @@ DefaultKeyFilter::TriState DefaultKeyFilter::expired() const
     return d_ptr->mExpired;
 }
 
+DefaultKeyFilter::TriState DefaultKeyFilter::invalid() const
+{
+    return d_ptr->mInvalid;
+}
+
 DefaultKeyFilter::TriState DefaultKeyFilter::disabled() const
 {
     return d_ptr->mDisabled;
diff --git a/src/kleo/defaultkeyfilter.h b/src/kleo/defaultkeyfilter.h
index 185a7ba..f2d442e 100644
--- a/src/kleo/defaultkeyfilter.h
+++ b/src/kleo/defaultkeyfilter.h
@@ -75,6 +75,7 @@ public:
 
     TriState revoked() const;
     TriState expired() const;
+    TriState invalid() const;
     TriState disabled() const;
     TriState root() const;
     TriState canEncrypt() const;
@@ -101,6 +102,7 @@ public:
 
     void setRevoked(const TriState) const;
     void setExpired(const TriState) const;
+    void setInvalid(const TriState) const;
     void setDisabled(const TriState) const;
     void setRoot(const TriState) const;
     void setCanEncrypt(const TriState) const;
-- 
GitLab