diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 13:46:02 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 13:46:02 +0000 |
commit | 785edf0885170e12c67ba499ad2a90eae259d83a (patch) | |
tree | ef9e7033a57feb77d357f8077da376514ae42cc8 /xmlsecurity/source/dialogs | |
parent | 8cc4d74160cc2d5eeea36064f27522720fbaebfb (diff) |
INTEGRATION: CWS hr50 (1.30.14); FILE MERGED
2008/04/11 16:22:42 hr 1.30.14.1: #i86574#: fix warning (gcc-4.2.3)
Diffstat (limited to 'xmlsecurity/source/dialogs')
-rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 0191d5ada087..7269a62ebdb2 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: digitalsignaturesdialog.cxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.32 $ * * This file is part of OpenOffice.org. * @@ -409,7 +409,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() //First we try to get the certificate which is embedded in the XML Signature if (rInfo.ouX509Certificate.getLength()) xCert = xSecEnv->createCertificateFromAscii(rInfo.ouX509Certificate); - else + else { //There must be an embedded certificate because we use it to get the //issuer name. We cannot use /Signature/KeyInfo/X509Data/X509IssuerName //because it could be modified by an attacker. The issuer is displayed @@ -417,6 +417,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox() //Comparing the X509IssuerName with the one from the X509Certificate in order //to find out if the X509IssuerName was modified does not work. See #i62684 DBG_ASSERT(sal_False, "Could not find embedded certificate!"); + } //In case there is no embedded certificate we try to get it from a local store //Todo: This probably could be removed, see above. |