xmlsecurity/source/helper/xmlsignaturehelper.cxx | 1
xmlsecurity/source/helper/xsecctl.cxx | 114
++++------
xmlsecurity/source/helper/xsecparser.cxx | 39
+--
xmlsecurity/source/helper/xsecsign.cxx | 26 --
xmlsecurity/source/helper/xsecverify.cxx | 45
+--
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx | 4
6 files changed, 107 insertions(+), 122 deletions(-)
New commits:
commit 89921cf183dbc573754a77dfbc7a7e79e47c54e5
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 12 16:17:25 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Oct 27 21:15:11 2021 +0200
expand out some namespace aliases [xmlsecurity/source/helper]
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94093
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
(cherry picked from commit 943fbfad668da76f7d0ebd4f4d8cdd67224d2f01)
plus one line in xsecverify.cxx from:
commit f59d9e7ea09482c2e9e5f52a8d0445e4cebc3df5
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Apr 3 15:53:49 2020 +0200
new loplugin:unusedvariableplus
a particularly aggressive checker, which is why it is off by default
Change-Id: I5fdb554a1b116824843f35645bc1cea3ca91e0f2
diff --git a/xmlsecurity/source/helper/xsecctl.cxx
b/xmlsecurity/source/helper/xsecctl.cxx
index 96d04436341f..cf04a39ac2d3 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -46,10 +46,6 @@
#include "ooxmlsecexporter.hxx"
#include <xmlsignaturehelper2.hxx>
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxs = com::sun::star::xml::sax;
using namespace com::sun::star;
namespace
@@ -58,11 +54,11 @@ OUString getDigestURI(sal_Int32 nID)
{
switch( nID )
{
- case cssxc::DigestID::SHA1:
+ case css::xml::crypto::DigestID::SHA1:
return OUString(ALGO_XMLDSIGSHA1);
- case cssxc::DigestID::SHA256:
+ case css::xml::crypto::DigestID::SHA256:
return OUString(ALGO_XMLDSIGSHA256);
- case cssxc::DigestID::SHA512:
+ case css::xml::crypto::DigestID::SHA512:
return OUString(ALGO_XMLDSIGSHA512);
default:
return OUString(ALGO_XMLDSIGSHA1);
@@ -72,11 +68,11 @@ OUString getSignatureURI(sal_Int32 nID)
{
switch( nID )
{
- case cssxc::DigestID::SHA1:
+ case css::xml::crypto::DigestID::SHA1:
return OUString(ALGO_RSASHA1);
- case cssxc::DigestID::SHA256:
+ case css::xml::crypto::DigestID::SHA256:
return OUString(ALGO_RSASHA256);
- case cssxc::DigestID::SHA512:
+ case css::xml::crypto::DigestID::SHA512:
return OUString(ALGO_RSASHA512);
default:
return OUString(ALGO_RSASHA1);
@@ -84,7 +80,7 @@ OUString getSignatureURI(sal_Int32 nID)
}
}
-XSecController::XSecController( const
cssu::Reference<cssu::XComponentContext>& rxCtx )
+XSecController::XSecController( const
css::uno::Reference<css::uno::XComponentContext>& rxCtx )
: mxCtx(rxCtx)
, m_nNextSecurityId(1)
, m_bIsPreviousNodeInitializable(false)
@@ -159,15 +155,15 @@ void XSecController::createXSecComponent( )
m_xXMLDocumentWrapper = nullptr;
m_xSAXEventKeeper = nullptr;
- cssu::Reference< cssl::XMultiComponentFactory > xMCF(
mxCtx->getServiceManager() );
+ css::uno::Reference< css::lang::XMultiComponentFactory > xMCF(
mxCtx->getServiceManager() );
#if HAVE_FEATURE_GPGME
- uno::Reference< lang::XServiceInfo > xServiceInfo( m_xSecurityContext,
cssu::UNO_QUERY );
+ uno::Reference< lang::XServiceInfo > xServiceInfo( m_xSecurityContext,
css::uno::UNO_QUERY );
if (xServiceInfo->getImplementationName() ==
"com.sun.star.xml.security.gpg.XMLSecurityContext_GpgImpl")
m_xXMLSignature.set(new XMLSignature_GpgImpl());
else // xmlsec or mscrypt
#endif
-
m_xXMLSignature.set(xMCF->createInstanceWithContext("com.sun.star.xml.crypto.XMLSignature",
mxCtx), cssu::UNO_QUERY);
+
m_xXMLSignature.set(xMCF->createInstanceWithContext("com.sun.star.xml.crypto.XMLSignature",
mxCtx), css::uno::UNO_QUERY);
bool bSuccess = m_xXMLSignature.is();
if ( bSuccess )
@@ -187,11 +183,11 @@ void XSecController::createXSecComponent( )
* SAXEventKeeper created successfully.
*/
{
- cssu::Sequence <cssu::Any> arg(1);
+ css::uno::Sequence <css::uno::Any> arg(1);
arg[0] <<=
uno::Reference<xml::wrapper::XXMLDocumentWrapper>(m_xXMLDocumentWrapper.get());
m_xSAXEventKeeper->initialize(arg);
- cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >
+ css::uno::Reference<
css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >
xStatusChangeListener = this;
m_xSAXEventKeeper->addSAXEventKeeperStatusChangeListener(
xStatusChangeListener );
@@ -254,7 +250,7 @@ bool XSecController::chainOn()
*/
m_xSAXEventKeeper->setNextHandler( nullptr );
- cssu::Reference< cssxs::XDocumentHandler >
xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),
cssu::UNO_QUERY);
+ css::uno::Reference< css::xml::sax::XDocumentHandler >
xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),
css::uno::UNO_QUERY);
/*
* connects the previous document handler on the SAX chain
@@ -263,17 +259,17 @@ bool XSecController::chainOn()
{
if ( m_bIsPreviousNodeInitializable )
{
- cssu::Reference< cssl::XInitialization > xInitialization
- (m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
+ css::uno::Reference< css::lang::XInitialization >
xInitialization
+ (m_xPreviousNodeOnSAXChain, css::uno::UNO_QUERY);
- cssu::Sequence<cssu::Any> aArgs( 1 );
+ css::uno::Sequence<css::uno::Any> aArgs( 1 );
aArgs[0] <<= xSEKHandler;
xInitialization->initialize(aArgs);
}
else
{
- cssu::Reference< cssxs::XParser > xParser
- (m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
+ css::uno::Reference< css::xml::sax::XParser > xParser
+ (m_xPreviousNodeOnSAXChain, css::uno::UNO_QUERY);
xParser->setDocumentHandler( xSEKHandler );
}
}
@@ -309,16 +305,16 @@ void XSecController::chainOff()
{
if ( m_bIsPreviousNodeInitializable )
{
- cssu::Reference< cssl::XInitialization > xInitialization
- (m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
+ css::uno::Reference< css::lang::XInitialization >
xInitialization
+ (m_xPreviousNodeOnSAXChain, css::uno::UNO_QUERY);
- cssu::Sequence<cssu::Any> aArgs( 1 );
+ css::uno::Sequence<css::uno::Any> aArgs( 1 );
aArgs[0] <<= uno::Reference<xml::sax::XDocumentHandler>();
xInitialization->initialize(aArgs);
}
else
{
- cssu::Reference< cssxs::XParser >
xParser(m_xPreviousNodeOnSAXChain, cssu::UNO_QUERY);
+ css::uno::Reference< css::xml::sax::XParser >
xParser(m_xPreviousNodeOnSAXChain, css::uno::UNO_QUERY);
xParser->setDocumentHandler(uno::Reference<xml::sax::XDocumentHandler>());
}
}
@@ -375,7 +371,7 @@ void XSecController::initializeSAXChain()
chainOff();
}
-cssu::Reference< css::io::XInputStream >
+css::uno::Reference< css::io::XInputStream >
XSecController::getObjectInputStream( const OUString& objectURL )
/****** XSecController/getObjectInputStream
************************************
*
@@ -392,7 +388,7 @@ cssu::Reference< css::io::XInputStream >
* xInputStream - the XInputStream interface
******************************************************************************/
{
- cssu::Reference< css::io::XInputStream > xObjectInputStream;
+ css::uno::Reference< css::io::XInputStream > xObjectInputStream;
SAL_WARN_IF( !m_xUriBinding.is(), "xmlsecurity.helper", "Need
XUriBinding!" );
@@ -412,7 +408,7 @@ sal_Int32 XSecController::getNewSecurityId( )
return nId;
}
-void XSecController::startMission(const rtl::Reference<UriBindingHelper>&
xUriBinding, const cssu::Reference< cssxc::XXMLSecurityContext >&
xSecurityContext )
+void XSecController::startMission(const rtl::Reference<UriBindingHelper>&
xUriBinding, const css::uno::Reference< css::xml::crypto::XXMLSecurityContext
>& xSecurityContext )
/****** XSecController/startMission *******************************************
*
* NAME
@@ -438,7 +434,7 @@ void XSecController::startMission(const
rtl::Reference<UriBindingHelper>& xUriBi
m_bVerifyCurrentSignature = false;
}
-void XSecController::setSAXChainConnector(const cssu::Reference<
cssl::XInitialization >& xInitialization)
+void XSecController::setSAXChainConnector(const css::uno::Reference<
css::lang::XInitialization >& xInitialization)
/****** XSecController/setSAXChainConnector ***********************************
*
* NAME
@@ -489,8 +485,8 @@ void XSecController::endMission()
* ResolvedListener only exist when the security components are
created.
*/
{
- cssu::Reference< cssxc::sax::XMissionTaker > xMissionTaker
- (
m_vInternalSignatureInformations[i].xReferenceResolvedListener, cssu::UNO_QUERY
);
+ css::uno::Reference< css::xml::crypto::sax::XMissionTaker >
xMissionTaker
+ (
m_vInternalSignatureInformations[i].xReferenceResolvedListener,
css::uno::UNO_QUERY );
/*
* asks the SignatureCreator/SignatureVerifier to release
@@ -549,7 +545,7 @@ void writeUnsignedProperties(
}
void XSecController::exportSignature(
- const cssu::Reference<cssxs::XDocumentHandler>& xDocumentHandler,
+ const css::uno::Reference<css::xml::sax::XDocumentHandler>&
xDocumentHandler,
const SignatureInformation& signatureInfo,
bool bXAdESCompliantIfODF )
/****** XSecController/exportSignature ****************************************
@@ -583,19 +579,19 @@ void XSecController::exportSignature(
signatureInfo.ouSignatureId);
}
- xDocumentHandler->startElement( "Signature", cssu::Reference<
cssxs::XAttributeList > (pAttributeList));
+ xDocumentHandler->startElement( "Signature", css::uno::Reference<
css::xml::sax::XAttributeList > (pAttributeList));
{
/* Write SignedInfo element */
xDocumentHandler->startElement(
"SignedInfo",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new
SvXMLAttributeList()));
{
/* Write CanonicalizationMethod element */
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
"Algorithm",
ALGO_C14N);
- xDocumentHandler->startElement( "CanonicalizationMethod",
cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
+ xDocumentHandler->startElement( "CanonicalizationMethod",
css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList) );
xDocumentHandler->endElement( "CanonicalizationMethod" );
/* Write SignatureMethod element */
@@ -609,7 +605,7 @@ void XSecController::exportSignature(
pAttributeList->AddAttribute(
"Algorithm",
getSignatureURI(vReferenceInfors[0].nDigestID));
- xDocumentHandler->startElement( "SignatureMethod",
cssu::Reference< cssxs::XAttributeList > (pAttributeList) );
+ xDocumentHandler->startElement( "SignatureMethod",
css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList) );
xDocumentHandler->endElement( "SignatureMethod" );
/* Write Reference element */
@@ -640,7 +636,7 @@ void XSecController::exportSignature(
"#" + refInfor.ouURI);
}
- xDocumentHandler->startElement( "Reference", cssu::Reference<
cssxs::XAttributeList > (pAttributeList) );
+ xDocumentHandler->startElement( "Reference",
css::uno::Reference< css::xml::sax::XAttributeList > (pAttributeList) );
{
/* Write Transforms element */
if (refInfor.nType == SignatureReferenceType::XMLSTREAM)
@@ -650,7 +646,7 @@ void XSecController::exportSignature(
{
xDocumentHandler->startElement(
"Transforms",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList
> (new SvXMLAttributeList()));
{
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute(
@@ -658,7 +654,7 @@ void XSecController::exportSignature(
ALGO_C14N);
xDocumentHandler->startElement(
"Transform",
- cssu::Reference< cssxs::XAttributeList >
(pAttributeList) );
+ css::uno::Reference<
css::xml::sax::XAttributeList > (pAttributeList) );
xDocumentHandler->endElement( "Transform" );
}
xDocumentHandler->endElement( "Transforms" );
@@ -671,13 +667,13 @@ void XSecController::exportSignature(
getDigestURI(refInfor.nDigestID));
xDocumentHandler->startElement(
"DigestMethod",
- cssu::Reference< cssxs::XAttributeList >
(pAttributeList) );
+ css::uno::Reference< css::xml::sax::XAttributeList >
(pAttributeList) );
xDocumentHandler->endElement( "DigestMethod" );
/* Write DigestValue element */
xDocumentHandler->startElement(
"DigestValue",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList >
(new SvXMLAttributeList()));
xDocumentHandler->characters( refInfor.ouDigestValue );
xDocumentHandler->endElement( "DigestValue" );
}
@@ -689,14 +685,14 @@ void XSecController::exportSignature(
/* Write SignatureValue element */
xDocumentHandler->startElement(
"SignatureValue",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new
SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouSignatureValue );
xDocumentHandler->endElement( "SignatureValue" );
/* Write KeyInfo element */
xDocumentHandler->startElement(
"KeyInfo",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new
SvXMLAttributeList()));
{
// GPG or X509 key?
if (!signatureInfo.ouGpgCertificate.isEmpty())
@@ -706,12 +702,12 @@ void XSecController::exportSignature(
/* Write PGPData element */
xDocumentHandler->startElement(
"PGPData",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList >
(pAttributeList));
{
/* Write keyid element */
xDocumentHandler->startElement(
"PGPKeyID",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList >
(new SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouCertDigest );
xDocumentHandler->endElement( "PGPKeyID" );
@@ -720,7 +716,7 @@ void XSecController::exportSignature(
{
xDocumentHandler->startElement(
"PGPKeyPacket",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList
> (new SvXMLAttributeList()));
xDocumentHandler->characters(
signatureInfo.ouGpgCertificate );
xDocumentHandler->endElement( "PGPKeyPacket" );
}
@@ -728,7 +724,7 @@ void XSecController::exportSignature(
/* Write PGPOwner element */
xDocumentHandler->startElement(
"loext:PGPOwner",
- cssu::Reference< cssxs::XAttributeList >(new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList
>(new SvXMLAttributeList()));
xDocumentHandler->characters( signatureInfo.ouGpgOwner );
xDocumentHandler->endElement( "loext:PGPOwner" );
}
@@ -739,24 +735,24 @@ void XSecController::exportSignature(
/* Write X509Data element */
xDocumentHandler->startElement(
"X509Data",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new
SvXMLAttributeList()));
{
/* Write X509IssuerSerial element */
xDocumentHandler->startElement(
"X509IssuerSerial",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList >
(new SvXMLAttributeList()));
{
/* Write X509IssuerName element */
xDocumentHandler->startElement(
"X509IssuerName",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList
> (new SvXMLAttributeList()));
xDocumentHandler->characters(
signatureInfo.ouX509IssuerName );
xDocumentHandler->endElement( "X509IssuerName" );
/* Write X509SerialNumber element */
xDocumentHandler->startElement(
"X509SerialNumber",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList
> (new SvXMLAttributeList()));
xDocumentHandler->characters(
signatureInfo.ouX509SerialNumber );
xDocumentHandler->endElement( "X509SerialNumber" );
}
@@ -767,7 +763,7 @@ void XSecController::exportSignature(
{
xDocumentHandler->startElement(
"X509Certificate",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList
> (new SvXMLAttributeList()));
xDocumentHandler->characters(
signatureInfo.ouX509Certificate );
xDocumentHandler->endElement( "X509Certificate" );
}
@@ -782,12 +778,12 @@ void XSecController::exportSignature(
/* Write Object element */
xDocumentHandler->startElement(
"Object",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new
SvXMLAttributeList()));
{
/* Write SignatureProperties element */
xDocumentHandler->startElement(
"SignatureProperties",
- cssu::Reference< cssxs::XAttributeList > (new
SvXMLAttributeList()));
+ css::uno::Reference< css::xml::sax::XAttributeList > (new
SvXMLAttributeList()));
{
/* Write SignatureProperty element */
pAttributeList = new SvXMLAttributeList();
@@ -799,7 +795,7 @@ void XSecController::exportSignature(
"#" + signatureInfo.ouSignatureId);
xDocumentHandler->startElement(
"SignatureProperty",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList >
(pAttributeList));
{
/* Write timestamp element */
@@ -810,7 +806,7 @@ void XSecController::exportSignature(
xDocumentHandler->startElement(
"dc:date",
- cssu::Reference< cssxs::XAttributeList >
(pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList >
(pAttributeList));
OUStringBuffer buffer;
//If the xml signature was already contained in the
document,
@@ -868,13 +864,13 @@ void XSecController::exportSignature(
pAttributeList->AddAttribute("xmlns:xd", NS_XD);
xDocumentHandler->startElement(
"Object",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList >
(pAttributeList));
{
pAttributeList = new SvXMLAttributeList();
pAttributeList->AddAttribute("Target", "#" +
signatureInfo.ouSignatureId);
xDocumentHandler->startElement(
"xd:QualifyingProperties",
- cssu::Reference< cssxs::XAttributeList > (pAttributeList));
+ css::uno::Reference< css::xml::sax::XAttributeList >
(pAttributeList));
DocumentSignatureHelper::writeSignedProperties(xDocumentHandler, signatureInfo,
sDate);
writeUnsignedProperties(xDocumentHandler, signatureInfo);
xDocumentHandler->endElement( "xd:QualifyingProperties" );
diff --git a/xmlsecurity/source/helper/xsecparser.cxx
b/xmlsecurity/source/helper/xsecparser.cxx
index 50c13dc95bee..6d1aa6af6645 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -25,9 +25,6 @@
#include <string.h>
-namespace cssu = com::sun::star::uno;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxs = com::sun::star::xml::sax;
XSecParser::XSecParser(XMLSignatureHelper& rXMLSignatureHelper,
XSecController* pXSecController)
@@ -46,12 +43,12 @@ XSecParser::XSecParser(XMLSignatureHelper&
rXMLSignatureHelper,
, m_bInDescription(false)
, m_pXSecController(pXSecController)
, m_bReferenceUnresolved(false)
- , m_nReferenceDigestID(cssxc::DigestID::SHA1)
+ , m_nReferenceDigestID(css::xml::crypto::DigestID::SHA1)
, m_rXMLSignatureHelper(rXMLSignatureHelper)
{
}
-OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList >&
xAttribs )
+OUString XSecParser::getIdAttr(const css::uno::Reference<
css::xml::sax::XAttributeList >& xAttribs )
{
OUString ouIdAttr = xAttribs->getValueByName("id");
@@ -95,7 +92,7 @@ void SAL_CALL XSecParser::endDocument( )
void SAL_CALL XSecParser::startElement(
const OUString& aName,
- const cssu::Reference< cssxs::XAttributeList >& xAttribs )
+ const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs )
{
try
{
@@ -146,11 +143,11 @@ void SAL_CALL XSecParser::startElement(
&& ouAlgorithm != ALGO_XMLDSIGSHA512,
"xmlsecurity.helper", "Algorithm neither SHA1,
SHA256 nor SHA512");
if (ouAlgorithm == ALGO_XMLDSIGSHA1)
- m_nReferenceDigestID = cssxc::DigestID::SHA1;
+ m_nReferenceDigestID = css::xml::crypto::DigestID::SHA1;
else if (ouAlgorithm == ALGO_XMLDSIGSHA256)
- m_nReferenceDigestID = cssxc::DigestID::SHA256;
+ m_nReferenceDigestID = css::xml::crypto::DigestID::SHA256;
else if (ouAlgorithm == ALGO_XMLDSIGSHA512)
- m_nReferenceDigestID = cssxc::DigestID::SHA512;
+ m_nReferenceDigestID = css::xml::crypto::DigestID::SHA512;
else
m_nReferenceDigestID = 0;
}
@@ -258,18 +255,18 @@ void SAL_CALL XSecParser::startElement(
m_xNextHandler->startElement(aName, xAttribs);
}
}
- catch (cssu::Exception& )
+ catch (css::uno::Exception& )
{//getCaughtException MUST be the first line in the catch block
- cssu::Any exc = cppu::getCaughtException();
- throw cssxs::SAXException(
+ css::uno::Any exc = cppu::getCaughtException();
+ throw css::xml::sax::SAXException(
"xmlsecurity: Exception in XSecParser::startElement",
nullptr, exc);
}
catch (...)
{
- throw cssxs::SAXException(
+ throw css::xml::sax::SAXException(
"xmlsecurity: unexpected exception in XSecParser::startElement",
nullptr,
- cssu::Any());
+ css::uno::Any());
}
}
@@ -367,18 +364,18 @@ void SAL_CALL XSecParser::endElement( const OUString&
aName )
m_xNextHandler->endElement(aName);
}
}
- catch (cssu::Exception& )
+ catch (css::uno::Exception& )
{//getCaughtException MUST be the first line in the catch block
- cssu::Any exc = cppu::getCaughtException();
- throw cssxs::SAXException(
+ css::uno::Any exc = cppu::getCaughtException();
+ throw css::xml::sax::SAXException(
"xmlsecurity: Exception in XSecParser::endElement",
nullptr, exc);
}
catch (...)
{
- throw cssxs::SAXException(
+ throw css::xml::sax::SAXException(
"xmlsecurity: unexpected exception in XSecParser::endElement",
nullptr,
- cssu::Any());
+ css::uno::Any());
}
}
@@ -459,7 +456,7 @@ void SAL_CALL XSecParser::processingInstruction( const
OUString& aTarget, const
}
}
-void SAL_CALL XSecParser::setDocumentLocator( const cssu::Reference<
cssxs::XLocator >& xLocator )
+void SAL_CALL XSecParser::setDocumentLocator( const css::uno::Reference<
css::xml::sax::XLocator >& xLocator )
{
if (m_xNextHandler.is())
{
@@ -471,7 +468,7 @@ void SAL_CALL XSecParser::setDocumentLocator( const
cssu::Reference< cssxs::XLoc
* XInitialization
*/
void SAL_CALL XSecParser::initialize(
- const cssu::Sequence< cssu::Any >& aArguments )
+ const css::uno::Sequence< css::uno::Any >& aArguments )
{
aArguments[0] >>= m_xNextHandler;
}
diff --git a/xmlsecurity/source/helper/xsecsign.cxx
b/xmlsecurity/source/helper/xsecsign.cxx
index b5e50f3c8bf0..72e00429aa5b 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -33,10 +33,6 @@
#include <framework/saxeventkeeperimpl.hxx>
using namespace com::sun::star;
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxs = com::sun::star::xml::sax;
/* protected: for signature generation */
OUString XSecController::createId()
@@ -54,7 +50,7 @@ OUString XSecController::createId()
return OUString::createFromAscii(str);
}
-cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepareSignatureToWrite(
+css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >
XSecController::prepareSignatureToWrite(
InternalSignatureInformation& internalSignatureInfor,
sal_Int32 nStorageFormat,
bool bXAdESCompliantIfODF)
@@ -65,13 +61,13 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
sal_Int32 nIdOfSignatureElementCollector;
nIdOfSignatureElementCollector =
- m_xSAXEventKeeper->addSecurityElementCollector(
cssxc::sax::ElementMarkPriority_AFTERMODIFY, true );
+ m_xSAXEventKeeper->addSecurityElementCollector(
css::xml::crypto::sax::ElementMarkPriority_AFTERMODIFY, true );
m_xSAXEventKeeper->setSecurityId(nIdOfSignatureElementCollector,
nSecurityId);
rtl::Reference<SignatureCreatorImpl> xSignatureCreator(new
SignatureCreatorImpl);
- cssu::Sequence<cssu::Any> args(5);
+ css::uno::Sequence<css::uno::Any> args(5);
args[0] <<= OUString::number(nSecurityId);
args[1] <<=
uno::Reference<xml::crypto::sax::XSecuritySAXEventKeeper>(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),
uno::UNO_QUERY);
args[2] <<= OUString::number(nIdOfSignatureElementCollector);
@@ -116,7 +112,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
{
const SignatureReferenceInformation& refInfor = vReferenceInfors[i];
- cssu::Reference< css::io::XInputStream > xInputStream
+ css::uno::Reference< css::io::XInputStream > xInputStream
= getObjectInputStream( refInfor.ouURI );
if (xInputStream.is())
@@ -127,7 +123,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
// use sha512 for gpg signing unconditionally
const sal_Int32 digestID =
!internalSignatureInfor.signatureInfor.ouGpgCertificate.isEmpty()?
- cssxc::DigestID::SHA512 : (bXAdESCompliantIfODF ?
cssxc::DigestID::SHA256 : cssxc::DigestID::SHA1);
+ css::xml::crypto::DigestID::SHA512 : (bXAdESCompliantIfODF ?
css::xml::crypto::DigestID::SHA256 : css::xml::crypto::DigestID::SHA1);
if (nStorageFormat != embed::StorageFormats::OFOPXML)
{
@@ -177,7 +173,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
void XSecController::signAStream( sal_Int32 securityId, const OUString& uri,
bool isBinary, bool bXAdESCompliantIfODF)
{
const SignatureReferenceType type = isBinary ?
SignatureReferenceType::BINARYSTREAM : SignatureReferenceType::XMLSTREAM;
- sal_Int32 digestID = bXAdESCompliantIfODF ? cssxc::DigestID::SHA256 :
cssxc::DigestID::SHA1;
+ sal_Int32 digestID = bXAdESCompliantIfODF ?
css::xml::crypto::DigestID::SHA256 : css::xml::crypto::DigestID::SHA1;
int index = findSignatureInfor( securityId );
@@ -191,7 +187,7 @@ void XSecController::signAStream( sal_Int32 securityId,
const OUString& uri, boo
{
// use sha512 for gpg signing unconditionally
if
(!m_vInternalSignatureInformations[index].signatureInfor.ouGpgCertificate.isEmpty())
- digestID = cssxc::DigestID::SHA512;
+ digestID = css::xml::crypto::DigestID::SHA512;
m_vInternalSignatureInformations[index].addReference(type, digestID,
uri, -1);
}
}
@@ -289,7 +285,7 @@ void XSecController::setDescription(sal_Int32 nSecurityId,
const OUString& rDesc
}
bool XSecController::WriteSignature(
- const cssu::Reference<cssxs::XDocumentHandler>& xDocumentHandler,
+ const css::uno::Reference<css::xml::sax::XDocumentHandler>&
xDocumentHandler,
bool bXAdESCompliantIfODF )
{
bool rc = false;
@@ -315,7 +311,7 @@ bool XSecController::WriteSignature(
/*
* export the signature template
*/
- cssu::Reference<cssxs::XDocumentHandler>
xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),cssu::UNO_QUERY);
+ css::uno::Reference<css::xml::sax::XDocumentHandler>
xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),css::uno::UNO_QUERY);
int i;
int sigNum = m_vInternalSignatureInformations.size();
@@ -336,7 +332,7 @@ bool XSecController::WriteSignature(
rc = true;
}
- catch( cssu::Exception& )
+ catch( css::uno::Exception& )
{
}
@@ -364,7 +360,7 @@ bool XSecController::WriteOOXMLSignature(const
uno::Reference<embed::XStorage>&
try
{
// Export the signature template.
- cssu::Reference<xml::sax::XDocumentHandler>
xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),
uno::UNO_QUERY);
+ css::uno::Reference<xml::sax::XDocumentHandler>
xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),
uno::UNO_QUERY);
for (InternalSignatureInformation & rInformation :
m_vInternalSignatureInformations)
{
diff --git a/xmlsecurity/source/helper/xsecverify.cxx
b/xmlsecurity/source/helper/xsecverify.cxx
index 1cece7fb4b8b..b2dc15fe787e 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -48,13 +48,9 @@
using namespace css;
using namespace css::uno;
using namespace css::beans;
-namespace cssu = com::sun::star::uno;
-namespace cssl = com::sun::star::lang;
-namespace cssxc = com::sun::star::xml::crypto;
-namespace cssxs = com::sun::star::xml::sax;
/* protected: for signature verify */
-cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepareSignatureToRead(
+css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >
XSecController::prepareSignatureToRead(
sal_Int32 nSecurityId)
{
if ( m_eStatusOfSecurityComponents != InitializationState::INITIALIZED )
@@ -63,10 +59,10 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
}
sal_Int32 nIdOfSignatureElementCollector;
- cssu::Reference< cssxc::sax::XReferenceResolvedListener >
xReferenceResolvedListener;
+ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >
xReferenceResolvedListener;
nIdOfSignatureElementCollector =
- m_xSAXEventKeeper->addSecurityElementCollector(
cssxc::sax::ElementMarkPriority_BEFOREMODIFY, false);
+ m_xSAXEventKeeper->addSecurityElementCollector(
css::xml::crypto::sax::ElementMarkPriority_BEFOREMODIFY, false);
m_xSAXEventKeeper->setSecurityId(nIdOfSignatureElementCollector,
nSecurityId);
@@ -75,9 +71,9 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
*/
xReferenceResolvedListener = new SignatureVerifierImpl;
- cssu::Reference<cssl::XInitialization>
xInitialization(xReferenceResolvedListener, cssu::UNO_QUERY);
+ css::uno::Reference<css::lang::XInitialization>
xInitialization(xReferenceResolvedListener, css::uno::UNO_QUERY);
- cssu::Sequence<cssu::Any> args(5);
+ css::uno::Sequence<css::uno::Any> args(5);
args[0] <<= OUString::number(nSecurityId);
args[1] <<=
uno::Reference<xml::crypto::sax::XSecuritySAXEventKeeper>(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),
uno::UNO_QUERY);
args[2] <<= OUString::number(nIdOfSignatureElementCollector);
@@ -85,8 +81,8 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
args[4] <<= m_xXMLSignature;
xInitialization->initialize(args);
- cssu::Reference< cssxc::sax::XSignatureVerifyResultBroadcaster >
- signatureVerifyResultBroadcaster(xReferenceResolvedListener,
cssu::UNO_QUERY);
+ css::uno::Reference<
css::xml::crypto::sax::XSignatureVerifyResultBroadcaster >
+ signatureVerifyResultBroadcaster(xReferenceResolvedListener,
css::uno::UNO_QUERY);
signatureVerifyResultBroadcaster->addSignatureVerifyResultListener( this );
@@ -94,7 +90,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
nIdOfSignatureElementCollector,
xReferenceResolvedListener);
- cssu::Reference<cssxc::sax::XKeyCollector> keyCollector
(xReferenceResolvedListener, cssu::UNO_QUERY);
+ css::uno::Reference<css::xml::crypto::sax::XKeyCollector> keyCollector
(xReferenceResolvedListener, css::uno::UNO_QUERY);
keyCollector->setKeyId(0);
return xReferenceResolvedListener;
@@ -102,7 +98,7 @@ cssu::Reference< cssxc::sax::XReferenceResolvedListener >
XSecController::prepar
void XSecController::addSignature()
{
- cssu::Reference< cssxc::sax::XReferenceResolvedListener >
xReferenceResolvedListener = nullptr;
+ css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >
xReferenceResolvedListener;
sal_Int32 nSignatureId = 0;
@@ -171,13 +167,13 @@ void XSecController::addStreamReference(
/*
* get the input stream
*/
- cssu::Reference< css::io::XInputStream > xObjectInputStream
+ css::uno::Reference< css::io::XInputStream > xObjectInputStream
= getObjectInputStream( ouUri );
if ( xObjectInputStream.is() )
{
- cssu::Reference<cssxc::XUriBinding> xUriBinding
- (isi.xReferenceResolvedListener, cssu::UNO_QUERY);
+ css::uno::Reference<css::xml::crypto::XUriBinding> xUriBinding
+ (isi.xReferenceResolvedListener, css::uno::UNO_QUERY);
xUriBinding->setUriBinding(ouUri, xObjectInputStream);
}
}
@@ -213,8 +209,8 @@ void XSecController::setReferenceCount() const
}
}
- cssu::Reference<cssxc::sax::XReferenceCollector> xReferenceCollector
- (isi.xReferenceResolvedListener, cssu::UNO_QUERY);
+ css::uno::Reference<css::xml::crypto::sax::XReferenceCollector>
xReferenceCollector
+ (isi.xReferenceResolvedListener, css::uno::UNO_QUERY);
xReferenceCollector->setReferenceCount( referenceCount );
}
}
@@ -459,7 +455,7 @@ void XSecController::collectToVerify( const OUString&
referenceId )
*/
{
bool bJustChainingOn = false;
- cssu::Reference< cssxs::XDocumentHandler > xHandler = nullptr;
+ css::uno::Reference< css::xml::sax::XDocumentHandler > xHandler;
int i,j;
int sigNum = m_vInternalSignatureInformations.size();
@@ -483,10 +479,10 @@ void XSecController::collectToVerify( const OUString&
referenceId )
}
sal_Int32 nKeeperId =
m_xSAXEventKeeper->addSecurityElementCollector(
- cssxc::sax::ElementMarkPriority_BEFOREMODIFY, false );
+
css::xml::crypto::sax::ElementMarkPriority_BEFOREMODIFY, false );
- cssu::Reference<cssxc::sax::XReferenceCollector>
xReferenceCollector
- ( isi.xReferenceResolvedListener, cssu::UNO_QUERY );
+
css::uno::Reference<css::xml::crypto::sax::XReferenceCollector>
xReferenceCollector
+ ( isi.xReferenceResolvedListener, css::uno::UNO_QUERY
);
m_xSAXEventKeeper->setSecurityId(nKeeperId,
isi.signatureInfor.nSecurityId);
m_xSAXEventKeeper->addReferenceResolvedListener(
nKeeperId, isi.xReferenceResolvedListener);
@@ -500,7 +496,6 @@ void XSecController::collectToVerify( const OUString&
referenceId )
if ( bJustChainingOn )
{
- cssu::Reference< cssxs::XDocumentHandler >
xSEKHandler(static_cast<cppu::OWeakObject*>(m_xSAXEventKeeper.get()),
cssu::UNO_QUERY);
m_xSAXEventKeeper->setNextHandler(xHandler);
}
}
@@ -514,13 +509,13 @@ void XSecController::addSignature( sal_Int32 nSignatureId
)
m_bVerifyCurrentSignature = true;
}
-cssu::Reference< cssxs::XDocumentHandler > const &
XSecController::createSignatureReader(XMLSignatureHelper& rXMLSignatureHelper,
sal_Int32 nType)
+css::uno::Reference< css::xml::sax::XDocumentHandler > const &
XSecController::createSignatureReader(XMLSignatureHelper& rXMLSignatureHelper,
sal_Int32 nType)
{
if (nType == embed::StorageFormats::OFOPXML)
m_xSecParser = new OOXMLSecParser(rXMLSignatureHelper, this);
else
m_xSecParser = new XSecParser(rXMLSignatureHelper, this);
- cssu::Reference< cssl::XInitialization > xInitialization(m_xSecParser,
uno::UNO_QUERY);
+ css::uno::Reference< css::lang::XInitialization >
xInitialization(m_xSecParser, uno::UNO_QUERY);
setSAXChainConnector(xInitialization);
commit a32e305bcdc7d47efa033da74309856deb41d37e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 8 17:05:28 2021 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Oct 27 21:03:00 2021 +0200
default to CertificateValidity::INVALID
so if CertGetCertificateChain fails we don't want validity to be
css::security::CertificateValidity::VALID which is what the old default
of 0 equates to
notably
commit 1e0bc66d16aee28ce8bd9582ea32178c63841902
Date: Thu Nov 5 16:55:26 2009 +0100
jl137: #103420# better logging
turned the nss equivalent of SecurityEnvironment_NssImpl::verifyCertificate
from 0 to CertificateValidity::INVALID like this change does
Change-Id: I5350dbc22d1b9b378da2976d3b0abd728f1f4c27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110561
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
(cherry picked from commit edeb164c1d8ab64116afee4e2140403a362a1358)
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index 3ec06fc0182c..9fe1924a6706 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -802,7 +802,7 @@ sal_Int32
SecurityEnvironment_MSCryptImpl::verifyCertificate(
const Reference< css::security::XCertificate >& aCert,
const Sequence< Reference< css::security::XCertificate > >& seqCerts)
{
- sal_Int32 validity = 0;
+ sal_Int32 validity = css::security::CertificateValidity::INVALID;
PCCERT_CHAIN_CONTEXT pChainContext = nullptr;
PCCERT_CONTEXT pCertContext = nullptr;
@@ -947,7 +947,7 @@ sal_Int32
SecurityEnvironment_MSCryptImpl::verifyCertificate(
}
else
{
- SAL_INFO("xmlsecurity.xmlsec", "CertGetCertificateChaine failed.");
+ SAL_INFO("xmlsecurity.xmlsec", "CertGetCertificateChain failed.");
}
}
commit ff80b0f3126506b4baac67ce67e224a7c3a68c8d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Mar 11 20:23:31 2021 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Oct 27 21:01:49 2021 +0200
do same set error state as ReadAndVerifySignature does
this function is nearly exactly the same as ReadAndVerifySignature
except it doesn't set error-state on exception during parse
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112366
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112412
(cherry picked from commit 52a23d595b820cab27d76d0e7c129f2757c762d6)
Change-Id: Ife881f639a11d3185920ca62cc2cd22812fae36d
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 28020545d74d..7d9d051383e1 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -403,6 +403,7 @@ bool
XMLSignatureHelper::ReadAndVerifySignatureStorageStream(const css::uno::Ref
catch(const uno::Exception& rException)
{
SAL_WARN("xmlsecurity.helper",
"XMLSignatureHelper::ReadAndVerifySignatureStorageStream: " << rException);
+ mbError = true;
}
mpXSecController->releaseSignatureReader();
