summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-07-11 16:18:19 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-07-14 17:12:57 +0200
commitbdbebda1d80f538f946b14042a366029f90d4820 (patch)
tree4c2ae8f15a3495d599343613bed51280e9c9286b
parent06929219aeb0cb3550bf0cf8b5de7f1164c00a8d (diff)
tdf#108831 PGP signature shown as invalid
It was valid, but not trusted. We need to show the owner trust in another place. gpg4libre Change-Id: I344a7b064a22c16b647c73d52f7abd91cfc86be9 Reviewed-on: https://gerrit.libreoffice.org/39826 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index 1849e7d3bc22..227c34d78d64 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -364,9 +364,7 @@ SAL_CALL XMLSignature_GpgImpl::validate(
data_signature, data_text);
// TODO: needs some more error handling, needs checking _all_ signatures
- if( verify_res.isNull() ||
- verify_res.numSignatures() == 0 ||
- verify_res.signature(0).validity() < GpgME::Signature::Full )
+ if( verify_res.isNull() || verify_res.numSignatures() == 0 )
{
// let's try again, but this time import the public key payload
// (avoiding that in a first cut for being a bit speedier)
@@ -415,9 +413,7 @@ SAL_CALL XMLSignature_GpgImpl::validate(
verify_res=rCtx.verifyDetachedSignature(data_signature, data_text);
// TODO: needs some more error handling, needs checking _all_ signatures
- if( verify_res.isNull() ||
- verify_res.numSignatures() == 0 ||
- verify_res.signature(0).validity() < GpgME::Signature::Full )
+ if( verify_res.isNull() || verify_res.numSignatures() == 0 )
{
clearErrorRecorder();
xmlFree(pSignatureValue);