summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/qa/certext/User_35_Root_11.crt8
-rw-r--r--xmlsecurity/source/component/registerservices.cxx4
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx1
-rw-r--r--xmlsecurity/source/framework/buffernode.cxx8
-rw-r--r--xmlsecurity/source/framework/saxeventkeeperimpl.cxx6
-rw-r--r--xmlsecurity/source/framework/xsec_framework.cxx4
-rw-r--r--xmlsecurity/source/xmlsec/xsec_xmlsec.cxx4
-rw-r--r--xmlsecurity/test_docs/certs/end_certs/User_35_Root_11.crt8
-rw-r--r--xmlsecurity/tools/demo/performance.cxx33
9 files changed, 39 insertions, 37 deletions
diff --git a/xmlsecurity/qa/certext/User_35_Root_11.crt b/xmlsecurity/qa/certext/User_35_Root_11.crt
index 6902605756af..0092d16c7a60 100644
--- a/xmlsecurity/qa/certext/User_35_Root_11.crt
+++ b/xmlsecurity/qa/certext/User_35_Root_11.crt
@@ -23,14 +23,14 @@ Certificate:
55:9b:90:91:f4:ce:56:04:d5
Exponent: 65537 (0x10001)
X509v3 extensions:
- X509v3 Key Usage:
+ X509v3 Key Usage:
Digital Signature, Non Repudiation, Key Encipherment
- X509v3 Subject Key Identifier:
+ X509v3 Subject Key Identifier:
91:47:AC:29:95:5D:EF:72:14:8F:82:45:07:E2:94:49:75:C6:7D:73
- X509v3 Authority Key Identifier:
+ X509v3 Authority Key Identifier:
keyid:E8:6A:BB:C2:90:EA:6C:70:22:3E:F6:F6:48:1B:03:E6:BE:B7:A6:55
- X509v3 Subject Alternative Name:
+ X509v3 Subject Alternative Name:
DNS:alt.openoffice.org, IP Address:192.168.7.1, IP Address:13:0:0:0:0:0:0:17, email:my@other.address, Registered ID:1.2.3.4, othername:<unsupported>, DirName:/C=DE/O=OpenOffice.org/OU=Development/CN=User 32 Root 11, URI:http://my.url.here/
Signature Algorithm: sha1WithRSAEncryption
6e:80:e6:1e:86:3d:d2:65:a6:17:fa:80:2d:2e:dc:85:32:05:
diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx
index ec5511128ece..0681a853744f 100644
--- a/xmlsecurity/source/component/registerservices.cxx
+++ b/xmlsecurity/source/component/registerservices.cxx
@@ -42,12 +42,12 @@ using namespace ::com::sun::star;
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void* pRet = 0;
uno::Reference< XInterface > xFactory;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index ac9cd08082ff..a40e1626404e 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -211,7 +211,6 @@ DigitalSignaturesDialog::DigitalSignaturesDialog(
{
// --> PB #i48253 the tablistbox needs its own unique id
maSignaturesLB.Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG );
- // <--
Size aControlSize( maSignaturesLB.GetSizePixel() );
aControlSize = maSignaturesLB.PixelToLogic( aControlSize, MapMode( MAP_APPFONT ) );
const long nControlWidth = aControlSize.Width();
diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx
index 0f4f2aa5080b..3761b27fc090 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -325,7 +325,7 @@ bool BufferNode::hasAnything() const
* Email: michael.mi@sun.com
******************************************************************************/
{
- return (m_pBlocker != NULL || m_vElementCollectors.size() > 0);
+ return (m_pBlocker != NULL || !m_vElementCollectors.empty());
}
bool BufferNode::hasChildren() const
@@ -352,7 +352,7 @@ bool BufferNode::hasChildren() const
* Email: michael.mi@sun.com
******************************************************************************/
{
- return (m_vChildren.size() > 0);
+ return (!m_vChildren.empty());
}
std::vector< const BufferNode* >* BufferNode::getChildren() const
@@ -386,7 +386,7 @@ const BufferNode* BufferNode::getFirstChild() const
{
BufferNode* rc = NULL;
- if (m_vChildren.size() > 0)
+ if (!m_vChildren.empty())
{
rc = (BufferNode*)m_vChildren.front();
}
@@ -895,7 +895,7 @@ void BufferNode::elementCollectorNotify()
* Email: michael.mi@sun.com
******************************************************************************/
{
- if (m_vElementCollectors.size()>0)
+ if (!m_vElementCollectors.empty())
{
cssxc::sax::ElementMarkPriority nMaxPriority = cssxc::sax::ElementMarkPriority_MINIMUM;
cssxc::sax::ElementMarkPriority nPriority;
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index a7bb8b8d4e60..99f2d60f3258 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -163,7 +163,7 @@ BufferNode* SAXEventKeeperImpl::addNewElementMarkBuffers()
{
BufferNode* pBufferNode = NULL;
- if ( (m_vNewElementCollectors.size()>0) ||
+ if ( (!m_vNewElementCollectors.empty()) ||
(m_pNewBlocker != NULL))
{
/*
@@ -204,7 +204,7 @@ BufferNode* SAXEventKeeperImpl::addNewElementMarkBuffers()
m_pNewBlocker = NULL;
}
- if (m_vNewElementCollectors.size()>0)
+ if (!m_vNewElementCollectors.empty())
{
std::vector< const ElementCollector* >::const_iterator ii = m_vNewElementCollectors.begin();
@@ -715,7 +715,7 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
******************************************************************************/
{
m_bIsReleasing = true;
- while (m_vReleasedElementMarkBuffers.size()>0)
+ while (!m_vReleasedElementMarkBuffers.empty())
{
std::vector< sal_Int32 >::iterator pId = m_vReleasedElementMarkBuffers.begin();
sal_Int32 nId = *pId;
diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx
index 289f6454a3c9..bec99e49686e 100644
--- a/xmlsecurity/source/framework/xsec_framework.cxx
+++ b/xmlsecurity/source/framework/xsec_framework.cxx
@@ -53,14 +53,14 @@ using namespace ::com::sun::star::registry;
extern "C"
{
//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment **)
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index 7d09ac0af1dd..a2f19665a5fc 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -100,13 +100,13 @@ extern void* nss_component_getFactory( const sal_Char*, void*, void* );
extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* );
#endif
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment **)
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
{
void* pRet = 0;
Reference< XInterface > xFactory ;
diff --git a/xmlsecurity/test_docs/certs/end_certs/User_35_Root_11.crt b/xmlsecurity/test_docs/certs/end_certs/User_35_Root_11.crt
index 6902605756af..0092d16c7a60 100644
--- a/xmlsecurity/test_docs/certs/end_certs/User_35_Root_11.crt
+++ b/xmlsecurity/test_docs/certs/end_certs/User_35_Root_11.crt
@@ -23,14 +23,14 @@ Certificate:
55:9b:90:91:f4:ce:56:04:d5
Exponent: 65537 (0x10001)
X509v3 extensions:
- X509v3 Key Usage:
+ X509v3 Key Usage:
Digital Signature, Non Repudiation, Key Encipherment
- X509v3 Subject Key Identifier:
+ X509v3 Subject Key Identifier:
91:47:AC:29:95:5D:EF:72:14:8F:82:45:07:E2:94:49:75:C6:7D:73
- X509v3 Authority Key Identifier:
+ X509v3 Authority Key Identifier:
keyid:E8:6A:BB:C2:90:EA:6C:70:22:3E:F6:F6:48:1B:03:E6:BE:B7:A6:55
- X509v3 Subject Alternative Name:
+ X509v3 Subject Alternative Name:
DNS:alt.openoffice.org, IP Address:192.168.7.1, IP Address:13:0:0:0:0:0:0:17, email:my@other.address, Registered ID:1.2.3.4, othername:<unsupported>, DirName:/C=DE/O=OpenOffice.org/OU=Development/CN=User 32 Root 11, URI:http://my.url.here/
Signature Algorithm: sha1WithRSAEncryption
6e:80:e6:1e:86:3d:d2:65:a6:17:fa:80:2d:2e:dc:85:32:05:
diff --git a/xmlsecurity/tools/demo/performance.cxx b/xmlsecurity/tools/demo/performance.cxx
index 1f8fc042fb6f..c8ee45907703 100644
--- a/xmlsecurity/tools/demo/performance.cxx
+++ b/xmlsecurity/tools/demo/performance.cxx
@@ -244,7 +244,7 @@ public:
struct AncestorEvent
{
- AncestorEvent( sal_Int32 nAttrNum ):aAttributeList(nAttrNum){};
+ AncestorEvent(sal_Int32 nAttrNum) : aAttributeList(nAttrNum), bIsStartElement(false) {};
bool bIsStartElement;
rtl::OUString ouName;
@@ -357,27 +357,30 @@ private:
const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler);
- void XSecTester::sendAncestorStartElementEvent(
+ void sendAncestorStartElementEvent(
const rtl::OUString& ouName,
const com::sun::star::uno::Sequence<
com::sun::star::xml::csax::XMLAttribute >& xAttrList,
const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler) const;
- void XSecTester::sendAncestorEndElementEvent(
+ void sendAncestorEndElementEvent(
const rtl::OUString& ouName,
const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler) const;
- std::vector< AncestorEvent* >::const_iterator XSecTester::checkAncestorStartElementEvent(
+ std::vector< AncestorEvent* >::const_iterator checkAncestorStartElementEvent(
const std::vector< AncestorEvent* >::const_iterator& ii,
const com::sun::star::uno::Reference<
com::sun::star::xml::sax::XDocumentHandler >& xDocumentHandler) const;
public:
- XSecTester(const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory >& rxMSF)
- :mxMSF( rxMSF ){};
+ XSecTester(const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory >& rxMSF)
+ : mxMSF(rxMSF), m_bIsExporting(false), m_bIsBlocking(false),
+ m_bIsInsideCollectedElement(false), m_bIsSAXEventKeeperOnTheSAXChain(false)
+ {
+ };
+
virtual ~XSecTester(){};
/* XSignatureCreationResultListener */
@@ -522,10 +525,10 @@ rtl::OUString XSecTester::parseFile(
m_bIsBlocking = false;
m_bIsInsideCollectedElement = false;
- OSL_ASSERT(m_vSignatureList.size() == 0);
- OSL_ASSERT(m_vUnsolvedReferenceURIs.size() == 0);
- OSL_ASSERT(m_vUnsolvedReferenceKeeperIds.size() == 0);
- OSL_ASSERT(m_vUnsolvedReferenceRefNums.size() == 0);
+ OSL_ASSERT(m_vSignatureList.empty());
+ OSL_ASSERT(m_vUnsolvedReferenceURIs.empty());
+ OSL_ASSERT(m_vUnsolvedReferenceKeeperIds.empty());
+ OSL_ASSERT(m_vUnsolvedReferenceRefNums.empty());
OSL_ASSERT(m_stCurrentPath.empty());
OSL_ASSERT(m_stCurrentPathType.empty());
OSL_ASSERT(m_vAncestorEvents.empty());
@@ -1510,9 +1513,9 @@ void XSecTester::checkReference(
void XSecTester::endMission()
{
- while (m_vSignatureList.size() > 0)
+ while (!m_vSignatureList.empty())
{
- if (m_vSignatureList.size()>0)
+ if (!m_vSignatureList.empty())
{
SignatureEntity * pSignatureEntity = m_vSignatureList.at(0);
m_vSignatureList.erase(m_vSignatureList.begin());
@@ -1521,7 +1524,7 @@ void XSecTester::endMission()
}
}
- while (m_vUnsolvedReferenceURIs.size()>0)
+ while (!m_vUnsolvedReferenceURIs.empty())
{
int nKeeperId = m_vUnsolvedReferenceKeeperIds.at(0);
m_xSAXEventKeeper->removeElementCollector(nKeeperId);
@@ -1641,7 +1644,7 @@ void XSecTester::flushAncestorEvents(
/* free the ancestor events list */
std::vector< AncestorEvent* >::iterator jj;
- while (m_vAncestorEvents.size()>0)
+ while (!m_vAncestorEvents.empty())
{
jj = m_vAncestorEvents.begin();
delete *jj;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 15:32:03 +0000