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

[Thorsten Behrens]

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

New commits:
commit 72687a57ec28a6de285d7ee7165c5292b9af2f65
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Jul 17 00:40:17 2017 +0200

    gpg4libre: unconditionally use binary IO
    
    Regardless of changing gpgme defaults, we don't want
    ascii armor anywhere.
    
    Change-Id: Ic1e80e134b8f24d05d6549ef19c5a82220718f1f
    Reviewed-on: https://gerrit.libreoffice.org/40024
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 8778e956d0e85b50dbf2512634e292c5360ba96d)
    Reviewed-on: https://gerrit.libreoffice.org/40044
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Vasily Melenchuk <vasily.melenchuk at cib.de>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 767ee22130bc..4f1fa807a2c2 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -32,6 +32,7 @@ SecurityEnvironmentGpg::SecurityEnvironmentGpg()
     m_ctx.reset( GpgME::Context::createForProtocol(GpgME::OpenPGP) );
     if (m_ctx == nullptr)
         throw RuntimeException("The GpgME library failed to initialize for the OpenPGP protocol.");
+    m_ctx->setArmor(false);
 }
 
 SecurityEnvironmentGpg::~SecurityEnvironmentGpg()