diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-06-24 00:50:31 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-06-25 01:32:13 +0200 |
| commit | 72e7cfd776dee2edfa513f8f1a8f45136de1d8ba (patch) | |
| tree | 831b7d0f151e244bbe8a9ceb819f61e528ba4507 /xmlsecurity | |
| parent | 52b3ae1c08803fe370960f80668e3fb715617358 (diff) | |
gpg4libre: save some space, extract binary key/sign data
Since callers will base64-encode this anyway, again
Change-Id: I0962d102fa0f2b95eaa2e608539cc291125f0321
Reviewed-on: https://gerrit.libreoffice.org/39193
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/gpg/CertificateImpl.cxx | 1 | ||||
| -rw-r--r-- | xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/xmlsecurity/source/gpg/CertificateImpl.cxx b/xmlsecurity/source/gpg/CertificateImpl.cxx index e87316e15005..20fa35c52d5d 100644 --- a/xmlsecurity/source/gpg/CertificateImpl.cxx +++ b/xmlsecurity/source/gpg/CertificateImpl.cxx @@ -211,6 +211,7 @@ void CertificateImpl::setCertificate(GpgME::Context* ctx, const GpgME::Key& key) // extract key data, store into m_aBits GpgME::Data data_out; + ctx->setArmor(false); // caller will base64-encode anyway GpgME::Error err = ctx->exportPublicKeys(key.keyID(), data_out); if (err) diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx index 6d3aece7dc32..4b48e11d577b 100644 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx @@ -200,6 +200,8 @@ SAL_CALL XMLSignature_GpgImpl::generate( SAL_INFO("xmlsecurity.xmlsec.gpg", "Generating signature for: " << xmlSecBufferGetData(pDsigCtx->transformCtx.result)); + // we base64-encode anyway + rCtx.setArmor(false); GpgME::SigningResult sign_res=rCtx.sign(data_in, data_out, GpgME::Detached); assert(data_out.seek(0,SEEK_SET) == 0); |