[Libreoffice-commits] core.git: xmlsecurity/source

[Noel Grandin (via logerrit)]

 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |    2 +-
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5b5d3d90f3d91f94b50a9c6a98bece0fd7e6593c
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jul 31 18:52:52 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 12:41:02 2021 +0200

    osl::Mutex->std::mutex in SecurityEnvironment_NssImpl
    
    Change-Id: I4b00afbe71b5459a9b1b8e612e44af71616a9b8c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119749
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 081d37e0a01d..2f0d878d11db 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -211,7 +211,7 @@ void SecurityEnvironment_NssImpl::adoptSymKey( PK11SymKey* aSymKey ) {
 void SecurityEnvironment_NssImpl::updateSlots()
 {
     //In case new tokens are present then we can obtain the corresponding slot
-    osl::MutexGuard guard(m_mutex);
+    std::lock_guard guard(m_mutex);
 
     m_Slots.clear();
     m_tSymKeyList.clear();
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index f2f04d1bef07..12310372096d 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/xml/crypto/XCertificateCreator.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
-#include <osl/mutex.hxx>
+#include <mutex>
 
 #include <keythi.h>
 #include <certt.h>
@@ -56,7 +56,7 @@ private:
     /// The last used certificate which has the private key for signing.
     css::uno::Reference<css::security::XCertificate> m_xSigningCertificate;
 
-    osl::Mutex m_mutex;
+    std::mutex m_mutex;
 
         CERTCertDBHandle*                   m_pHandler ;
         std::vector< PK11SymKey* >          m_tSymKeyList ;