[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-0' - xmlsecurity/source

[Thorsten Behrens]

 xmlsecurity/source/gpg/SecurityEnvironment.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7dd0774e3dbd5a5001666b045f06bebafc701ae
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Jul 17 00:56:06 2017 +0200

    gpg4libre: search for _all_ local keys in getCertificate()
    
    Otherwise, newly-imported ones will not show up, which is
    bad when trying to figure out how much we trust a key in
    DocumentDigitalSignatures::ImplVerifySignatures()
    
    Change-Id: I771cf71b5e0ddb5cc76db94d7ada4c5291fe56f1
    Reviewed-on: https://gerrit.libreoffice.org/40023
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 59960eab5370477c809babdbfae9668dfa845e2d)
    Reviewed-on: https://gerrit.libreoffice.org/40025
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit df84297026ddd16353456cb6b55f81d2ae7f9772)
    Reviewed-on: https://gerrit.libreoffice.org/40046
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Reviewed-by: Vasily Melenchuk <vasily.melenchuk at cib.de>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 4f1fa807a2c2..e910ee50b2ad 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -110,7 +110,7 @@ Reference< XCertificate > SecurityEnvironmentGpg::getCertificate( const OUString
         throw RuntimeException("Base64 decode failed");
 
     m_ctx->setKeyListMode(GPGME_KEYLIST_MODE_LOCAL);
-    GpgME::Error err = m_ctx->startKeyListing("", true);
+    GpgME::Error err = m_ctx->startKeyListing("", false);
     while (!err) {
         GpgME::Key k = m_ctx->nextKey(err);
         if (err)