[Libreoffice-commits] core.git: 2 commits - extensions/source offapi/com ucb/source xmlsecurity/qa xmlsecurity/source xmlsecurity/workben
Tor Lillqvist
tml at collabora.com
Wed Dec 21 19:26:43 UTC 2016
extensions/source/propctrlr/taborder.cxx | 2
extensions/source/propctrlr/taborder.hxx | 5 -
offapi/com/sun/star/xml/crypto/XSEInitializer.idl | 5 -
ucb/source/ucp/cmis/certvalidation_handler.cxx | 2
ucb/source/ucp/webdav-neon/NeonSession.cxx | 2
ucb/source/ucp/webdav/SerfSession.cxx | 2
xmlsecurity/qa/certext/SanCertExt.cxx | 2
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 10 +-
xmlsecurity/source/helper/documentsignaturemanager.cxx | 2
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 43 ----------
xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx | 2
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 2
xmlsecurity/workben/pdfverify.cxx | 2
14 files changed, 22 insertions(+), 61 deletions(-)
New commits:
commit 59a5664ffb5db3f313ad4e35ae815ad70be7c513
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Dec 21 20:19:27 2016 +0200
loplugin:staticmethods
Change-Id: I30456ec3a0440364b8b4c460d198588aed241034
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index bb33c49..617a34e 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -126,7 +126,7 @@ namespace pcr
ModalDialog::dispose();
}
- Image TabOrderDialog::GetImage( const Reference< XPropertySet >& _rxSet ) const
+ Image TabOrderDialog::GetImage( const Reference< XPropertySet >& _rxSet )
{
sal_uInt16 nImageId = RID_SVXBMP_CONTROL;
// TODO: classify controls also in Basic propbrw
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 130ea42..0c4aa9d 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -82,9 +82,10 @@ namespace pcr
DECL_LINK( OKClickHdl, Button*, void );
void FillList();
- Image GetImage(
+
+ static Image GetImage(
const css::uno::Reference< css::beans::XPropertySet > & _rxSet
- ) const;
+ );
public:
TabOrderDialog(
commit e1ce7bad62f07faf8f21adac6c3848d142f61953
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Dec 21 19:49:10 2016 +0200
[API CHANGE] createSecurityContext() was always called with an empty string
So drop the parameter then and propagate fallout in the Windows
implementation in xmlsecurity. The NSS implementation already ignored
the parameter completely.
This interface is not 'published' and the parameter was even marked as
'reserved for internal use' so I doubt any external code has used it.
Change-Id: I5915b941b79cfddadc8137c32ed07c20c9ccaa37
diff --git a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
index fc8ce62..2c1beeb 100644
--- a/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
+++ b/offapi/com/sun/star/xml/crypto/XSEInitializer.idl
@@ -35,12 +35,9 @@ interface XSEInitializer : com::sun::star::uno::XInterface
/**
Creates a security context.
- @param aString
- reserved for internal use.
-
@return the security context created
*/
- ::com::sun::star::xml::crypto::XXMLSecurityContext createSecurityContext( [in] string aString );
+ ::com::sun::star::xml::crypto::XXMLSecurityContext createSecurityContext();
/**
* Frees a security context.
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.cxx b/ucb/source/ucp/cmis/certvalidation_handler.cxx
index f13c75b..cf2993c 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.cxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.cxx
@@ -46,7 +46,7 @@ namespace cmis
if ( xSEInitializer.is() )
{
uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext(
- xSEInitializer->createSecurityContext( OUString() ) );
+ xSEInitializer->createSecurityContext() );
uno::Reference< xml::crypto::XSecurityEnvironment > xSecurityEnv(
xSecurityContext->getSecurityEnvironment() );
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index d614a79..f2570c7 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -398,7 +398,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
return 1;
uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext(
- xSEInitializer->createSecurityContext( OUString() ) );
+ xSEInitializer->createSecurityContext() );
uno::Reference< xml::crypto::XSecurityEnvironment > xSecurityEnv(
xSecurityContext->getSecurityEnvironment() );
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 40c8ffe..6ee053f 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -373,7 +373,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
css::uno::Reference< css::xml::crypto::XSEInitializer > xSEInitializer =
css::xml::crypto::SEInitializer::create( xContext );
- xSecurityContext = xSEInitializer->createSecurityContext( OUString() );
+ xSecurityContext = xSEInitializer->createSecurityContext();
if (xSecurityContext.is())
xSecurityEnv = xSecurityContext->getSecurityEnvironment();
diff --git a/xmlsecurity/qa/certext/SanCertExt.cxx b/xmlsecurity/qa/certext/SanCertExt.cxx
index 43254fd..3102ca0 100644
--- a/xmlsecurity/qa/certext/SanCertExt.cxx
+++ b/xmlsecurity/qa/certext/SanCertExt.cxx
@@ -126,7 +126,7 @@ namespace {
uno::Reference< lang::XMultiServiceFactory > factory(context->getServiceManager(), uno::UNO_QUERY_THROW);
uno::Reference< xml::crypto::XSEInitializer > xSEInitializer = xml::crypto::SEInitializer::create(context);
uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext(
- xSEInitializer->createSecurityContext(OUString()));
+ xSEInitializer->createSecurityContext());
return xSecurityContext->getSecurityEnvironment();
}
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 507b3e5..cbde517 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -119,7 +119,7 @@ void PDFSigningTest::setUp()
std::vector<SignatureInformation> PDFSigningTest::verify(const OUString& rURL, size_t nCount, const OString& rExpectedSubFilter)
{
uno::Reference<xml::crypto::XSEInitializer> xSEInitializer = xml::crypto::SEInitializer::create(mxComponentContext);
- uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());
+ uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext();
std::vector<SignatureInformation> aRet;
SvFileStream aStream(rURL, StreamMode::READ);
@@ -151,7 +151,7 @@ bool PDFSigningTest::sign(const OUString& rInURL, const OUString& rOutURL, size_
{
// Make sure that input has nOriginalSignatureCount signatures.
uno::Reference<xml::crypto::XSEInitializer> xSEInitializer = xml::crypto::SEInitializer::create(mxComponentContext);
- uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());
+ uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext();
xmlsecurity::pdfio::PDFDocument aDocument;
{
SvFileStream aStream(rInURL, StreamMode::READ);
@@ -223,7 +223,7 @@ void PDFSigningTest::testPDFRemove()
{
// Make sure that good.pdf has 1 valid signature.
uno::Reference<xml::crypto::XSEInitializer> xSEInitializer = xml::crypto::SEInitializer::create(mxComponentContext);
- uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());
+ uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext();
xmlsecurity::pdfio::PDFDocument aDocument;
{
OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY);
@@ -257,7 +257,7 @@ void PDFSigningTest::testPDFRemoveAll()
// testPDFRemove(), here intentionally test DocumentSignatureManager and
// PDFSignatureHelper code as well.
uno::Reference<xml::crypto::XSEInitializer> xSEInitializer = xml::crypto::SEInitializer::create(mxComponentContext);
- uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());
+ uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext();
// Copy the test document to a temporary file, as it'll be modified.
OUString aTargetDir = m_directories.getURLFromWorkdir("/CppunitTest/xmlsecurity_pdfsigning.test.user/");
@@ -410,7 +410,7 @@ void PDFSigningTest::testUnknownSubFilter()
{
// Tokenize the bugdoc.
uno::Reference<xml::crypto::XSEInitializer> xSEInitializer = xml::crypto::SEInitializer::create(mxComponentContext);
- uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());
+ uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext();
SvStream* pStream = utl::UcbStreamHelper::CreateStream(m_directories.getURLFromSrc(DATA_DIRECTORY) + "cr-comment.pdf", StreamMode::READ | StreamMode::WRITE);
uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStream));
DocumentSignatureManager aManager(mxComponentContext, DocumentSignatureMode::Content);
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 76e0b0a..df753def 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -56,7 +56,7 @@ bool DocumentSignatureManager::init()
mxSEInitializer = css::xml::crypto::SEInitializer::create(mxContext);
if (mxSEInitializer.is())
- mxSecurityContext = mxSEInitializer->createSecurityContext(OUString());
+ mxSecurityContext = mxSEInitializer->createSecurityContext();
return mxSecurityContext.is();
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
index 91158dd..a933ba9 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
@@ -45,31 +45,12 @@ SEInitializer_MSCryptImpl::~SEInitializer_MSCryptImpl()
/* XSEInitializer */
cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
- SEInitializer_MSCryptImpl::createSecurityContext(
- const OUString& sCertDB )
+ SEInitializer_MSCryptImpl::createSecurityContext()
throw (cssu::RuntimeException)
{
- const char* n_pCertStore ;
- HCERTSTORE n_hStoreHandle ;
-
//Initialize the crypto engine
- if( sCertDB.getLength() > 0 )
- {
- OString sCertDir(sCertDB.getStr(), sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US);
- n_pCertStore = sCertDir.getStr();
- n_hStoreHandle = CertOpenSystemStore( NULL, n_pCertStore ) ;
- if( n_hStoreHandle == nullptr )
- {
- return nullptr;
- }
- }
- else
- {
- n_pCertStore = nullptr ;
- n_hStoreHandle = nullptr ;
- }
- xmlSecMSCryptoAppInit( n_pCertStore ) ;
+ xmlSecMSCryptoAppInit( nullptr ) ;
try {
/* Build Security Environment */
@@ -80,24 +61,11 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
SecurityEnvironment_MSCryptImpl* pSecEnv = reinterpret_cast<SecurityEnvironment_MSCryptImpl*>(xSecEnvTunnel->getSomething( SecurityEnvironment_MSCryptImpl::getUnoTunnelId() ));
if( pSecEnv == nullptr )
{
- if( n_hStoreHandle != nullptr )
- {
- CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
- }
-
xmlSecMSCryptoAppShutdown() ;
return nullptr;
}
- if( n_hStoreHandle != nullptr )
- {
- pSecEnv->setCryptoSlot( n_hStoreHandle ) ;
- pSecEnv->setCertDb( n_hStoreHandle ) ;
- }
- else
- {
- pSecEnv->enableDefaultCrypt( true ) ;
- }
+ pSecEnv->enableDefaultCrypt( true ) ;
/* Build XML Security Context */
cssu::Reference< cssxc::XXMLSecurityContext > xSecCtx = cssxc::XMLSecurityContext::create( mxContext );
@@ -107,11 +75,6 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
}
catch( cssu::Exception& )
{
- if( n_hStoreHandle != nullptr )
- {
- CertCloseStore( n_hStoreHandle, CERT_CLOSE_STORE_FORCE_FLAG ) ;
- }
-
xmlSecMSCryptoAppShutdown() ;
return nullptr;
}
diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
index 46c698c..ac11d9f 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx
@@ -56,7 +56,7 @@ public:
/* XSEInitializer */
virtual css::uno::Reference< css::xml::crypto::XXMLSecurityContext >
- SAL_CALL createSecurityContext( const OUString& certDB )
+ SAL_CALL createSecurityContext()
throw (css::uno::RuntimeException) override;
virtual void SAL_CALL freeSecurityContext( const css::uno::Reference<
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 012106c..0273a28 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -63,7 +63,7 @@ SEInitializer_NssImpl::~SEInitializer_NssImpl()
/* XSEInitializer */
uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL
- SEInitializer_NssImpl::createSecurityContext( const OUString& )
+ SEInitializer_NssImpl::createSecurityContext()
throw (uno::RuntimeException, std::exception)
{
CERTCertDBHandle *pCertHandle = nullptr ;
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index 6854732..e223134 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -41,7 +41,7 @@ public:
/* XSEInitializer */
virtual css::uno::Reference< css::xml::crypto::XXMLSecurityContext >
- SAL_CALL createSecurityContext( const OUString& )
+ SAL_CALL createSecurityContext()
throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL freeSecurityContext( const css::uno::Reference<
diff --git a/xmlsecurity/workben/pdfverify.cxx b/xmlsecurity/workben/pdfverify.cxx
index 92504fc..fea369d 100644
--- a/xmlsecurity/workben/pdfverify.cxx
+++ b/xmlsecurity/workben/pdfverify.cxx
@@ -56,7 +56,7 @@ int pdfVerify(int nArgc, char** pArgv)
SAL_WARN("xmlsecurity.pdfio", "DeploymentException while creating SEInitializer: " << rException.Message);
return 1;
}
- uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());
+ uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext();
OUString aInURL;
osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(pArgv[1]), aInURL);
More information about the Libreoffice-commits
mailing list