summaryrefslogtreecommitdiff
path: root/xmlsecurity/source
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2017-07-10 10:38:26 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-07-14 15:20:48 +0200
commit61a171290595fd6033851c1b30239057ffd54c37 (patch)
tree9b8ee5af31aa84ec5e1862e3b27e6e120fdd9835 /xmlsecurity/source
parent25e0fef51557d2c93cf287dfb4721bb4c0086107 (diff)
tdf#109046 Show correct signature type for OpenPGP
gpg4libre Change-Id: I9c05f68e16928d14a29058f5bb9aa35c90b8f48b Reviewed-on: https://gerrit.libreoffice.org/39744 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit efb24fc7bab19840d4959d22706719981dc8bac0) Reviewed-on: https://gerrit.libreoffice.org/39911 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 22154dc4b2a3..fd4a7f13f79d 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -571,8 +571,11 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
// Decide type string.
if (maSignatureManager.mxStore.is())
{
+ // OpenPGP
+ if (!rInfo.ouGpgCertificate.isEmpty())
+ aType = "OpenPGP";
// XML based: XAdES or not.
- if (!rInfo.ouCertDigest.isEmpty())
+ else if (!rInfo.ouCertDigest.isEmpty())
aType = "XAdES";
else
aType = "XML-DSig";