summaryrefslogtreecommitdiff
path: root/xmlsecurity/source/helper/xsecsign.cxx
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-07-10 10:02:10 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-07-14 15:18:17 +0200
commitd3219c5e801056c1c3ca0d9912794b804c2d763e (patch)
tree50da0ef55fde4f19531eaf96a4a949bb949b2348 /xmlsecurity/source/helper/xsecsign.cxx
parent520a5a8a21e986355e4f7f5e8b5bddecb00a34d9 (diff)
tdf#108977 Show signature info for keys we don't have locally
gpg4libre Reviewed-on: https://gerrit.libreoffice.org/39742 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 820bd4b3b64a5746599c48c729037a959ff61c84) Change-Id: I89593224590007e61bce95c14922c08551282067 Reviewed-on: https://gerrit.libreoffice.org/39761 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmlsecurity/source/helper/xsecsign.cxx')
-rw-r--r--xmlsecurity/source/helper/xsecsign.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index 452613b4d10b..278eba79f8af 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -242,7 +242,8 @@ void XSecController::setX509Certificate(
void XSecController::setGpgCertificate(
sal_Int32 nSecurityId,
const OUString& ouCertDigest,
- const OUString& ouCert)
+ const OUString& ouCert,
+ const OUString& ouOwner)
{
int index = findSignatureInfor( nSecurityId );
@@ -250,6 +251,7 @@ void XSecController::setGpgCertificate(
{
InternalSignatureInformation isi(nSecurityId, nullptr);
isi.signatureInfor.ouGpgCertificate = ouCert;
+ isi.signatureInfor.ouGpgOwner = ouOwner;
isi.signatureInfor.ouCertDigest = ouCertDigest;
m_vInternalSignatureInformations.push_back( isi );
}
@@ -258,6 +260,7 @@ void XSecController::setGpgCertificate(
SignatureInformation &si
= m_vInternalSignatureInformations[index].signatureInfor;
si.ouGpgCertificate = ouCert;
+ si.ouGpgOwner = ouOwner;
si.ouCertDigest = ouCertDigest;
}
}