summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2017-07-17 00:40:17 +0200
committerMichael Stahl <mstahl@redhat.com>2017-07-17 17:08:05 +0200
commit72687a57ec28a6de285d7ee7165c5292b9af2f65 (patch)
tree64090494b5a67777f55345375f429585fd0082e0
parentb90be9916d3438d3731721ddbd2191ce67e68201 (diff)
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@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 8778e956d0e85b50dbf2512634e292c5360ba96d) Reviewed-on: https://gerrit.libreoffice.org/40044 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--xmlsecurity/source/gpg/SecurityEnvironment.cxx1
1 files changed, 1 insertions, 0 deletions
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()