diff --git a/frameworks/js/napi/tls/src/tls_socket.cpp b/frameworks/js/napi/tls/src/tls_socket.cpp index 6dead8b70c919b86c4de8f81575e313435109bac..d125ab948b0c0ba74cf46d7fe5e0fd0f42e6505d 100644 --- a/frameworks/js/napi/tls/src/tls_socket.cpp +++ b/frameworks/js/napi/tls/src/tls_socket.cpp @@ -1301,6 +1301,7 @@ bool TLSSocket::TLSSocketInternal::Send(const std::string &data) return false; } } + if (data.empty()) { NETSTACK_LOGE("data is empty"); return true; @@ -1368,7 +1369,6 @@ bool TLSSocket::TLSSocketInternal::Close() bool TLSSocket::TLSSocketInternal::SetAlpnProtocols(const std::vector &alpnProtocols) { - std::lock_guard lock(mutexForSsl_); if (!ssl_) { NETSTACK_LOGE("ssl is null"); return false; @@ -1412,7 +1412,6 @@ TLSConfiguration TLSSocket::TLSSocketInternal::GetTlsConfiguration() const std::vector TLSSocket::TLSSocketInternal::GetCipherSuite() const { - std::lock_guard lock(mutexForSsl_); if (!ssl_) { NETSTACK_LOGE("ssl in null"); return {}; @@ -1450,7 +1449,6 @@ std::vector TLSSocket::TLSSocketInternal::GetSignatureAlgorithms() std::string TLSSocket::TLSSocketInternal::GetProtocol() const { - std::lock_guard lock(mutexForSsl_); if (!ssl_) { NETSTACK_LOGE("ssl in null"); return PROTOCOL_UNKNOW; @@ -1822,7 +1820,6 @@ bool TLSSocket::TLSSocketInternal::StartShakingHands(const TLSConnectOptions &op bool TLSSocket::TLSSocketInternal::GetRemoteCertificateFromPeer() { - std::lock_guard lock(mutexForSsl_); peerX509_ = SSL_get_peer_certificate(ssl_); if (peerX509_ == nullptr) { int resErr = ConvertSSLError(); diff --git a/interfaces/innerkits/tls_socket/include/tls_socket.h b/interfaces/innerkits/tls_socket/include/tls_socket.h index d8c0ef5c8a245ff534cf2d53c8ede9151e81646e..901a3d4c8d8338def2210db028f1180a2733dce7 100644 --- a/interfaces/innerkits/tls_socket/include/tls_socket.h +++ b/interfaces/innerkits/tls_socket/include/tls_socket.h @@ -576,7 +576,7 @@ private: const X509 *x509Certificates); private: - mutable std::mutex mutexForSsl_; + std::mutex mutexForSsl_; mutable std::shared_mutex rw_mutex_; ssl_st *ssl_ = nullptr; X509 *peerX509_ = nullptr;