summaryrefslogtreecommitdiff
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:19:42 +0200
commit5bccacf784dc26fb806d14a2acc2bec7e414c7bc (patch)
treef9bd57873bd8809703eb49e3139685b4ffbc9475
parentd3219c5e801056c1c3ca0d9912794b804c2d763e (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/39786 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-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";