xmlsecurity/source/gpg/SecurityEnvironment.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 561d25301bf2a04a2cd34f1674a792167cf5f43b
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Wed Oct 18 14:23:37 2017 +0200
gpg4libre fix tdf#113190 don't show expired/invalid keys
Change-Id: I30485bc97d3d287bd867b50398927eabe018914b
Reviewed-on: https://gerrit.libreoffice.org/43502
Reviewed-by: Eike Rathke <er...@redhat.com>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 087a90e27b7219e8c1aaa880b39376c94a0dcaae)
Reviewed-on: https://gerrit.libreoffice.org/43503
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index a90ef15a1640..24e23a8f2f11 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -76,7 +76,7 @@ Sequence< Reference < XCertificate > >
SecurityEnvironmentGpg::getPersonalCertif
GpgME::Key k = m_ctx->nextKey(err);
if (err)
break;
- if (!k.isInvalid()) {
+ if (!k.isRevoked() && !k.isExpired() && !k.isDisabled() &&
!k.isInvalid()) {
// We can't create CertificateImpl here as
CertificateImpl::setCertificate uses GpgME API
// which interrupts our key listing here. So first get the keys
from GpgME, then create the CertificateImpls
keyList.push_back(k);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
