diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-23 22:24:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-24 14:45:11 +0100 |
| commit | b0163975efc6924c154793590a759784ffa77d08 (patch) | |
| tree | 6874dbf19602bd771e99efe6e1cef58e3c3c56bd /xmlsecurity | |
| parent | c5a0bcf94403a29490d707ae1878fba3e0423d13 (diff) | |
osl::Mutex->std::mutex in OCipherContext
Change-Id: I0a457dc8ddccc0fce42032956aff6d661d1ae80a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127403
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 6 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx index c4d1c6113bf6..ff3441249435 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx @@ -63,8 +63,6 @@ uno::Reference< xml::crypto::XCipherContext > OCipherContext::Create( CK_MECHANI void OCipherContext::Dispose() { - ::osl::MutexGuard aGuard( m_aMutex ); - if ( m_pContext ) { PK11_DestroyContext( m_pContext, PR_TRUE ); @@ -94,7 +92,7 @@ void OCipherContext::Dispose() uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::convertWithCipherContext( const uno::Sequence< ::sal_Int8 >& aData ) { - ::osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( m_bBroken ) throw uno::RuntimeException(); @@ -174,7 +172,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::convertWithCipherContext( c uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::finalizeCipherContextAndDispose() { - ::osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( m_bBroken ) throw uno::RuntimeException(); diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx index 3ac5df6c7fd0..40b610ef512e 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx @@ -22,14 +22,14 @@ #include <com/sun/star/xml/crypto/XCipherContext.hpp> #include <cppuhelper/implbase.hxx> -#include <osl/mutex.hxx> +#include <mutex> #include <seccomon.h> #include <secmodt.h> class OCipherContext : public cppu::WeakImplHelper< css::xml::crypto::XCipherContext > { private: - ::osl::Mutex m_aMutex; + std::mutex m_aMutex; PK11SlotInfo* m_pSlot; PK11SymKey* m_pSymKey; |