diff --git a/frameworks/js/napi/fetch/fetch_exec/include/fetch_exec.h b/frameworks/js/napi/fetch/fetch_exec/include/fetch_exec.h index d479afeddbb2f575c0836b3130cc4d579ff1054d..d2b6125b9e603dbdfbfac7a8bc0aa0fb14c69be4 100644 --- a/frameworks/js/napi/fetch/fetch_exec/include/fetch_exec.h +++ b/frameworks/js/napi/fetch/fetch_exec/include/fetch_exec.h @@ -65,7 +65,7 @@ private: private: static std::mutex mutex_; - static bool initialized_; + static std::atomic initialized_; }; } // namespace OHOS::NetStack::Fetch diff --git a/frameworks/js/napi/fetch/fetch_exec/src/fetch_exec.cpp b/frameworks/js/napi/fetch/fetch_exec/src/fetch_exec.cpp index 839c68038f981d9ca9e37e4f6424e274a7e93000..b40c8459e6024580d6c484e6cc5a18b021167c4e 100644 --- a/frameworks/js/napi/fetch/fetch_exec/src/fetch_exec.cpp +++ b/frameworks/js/napi/fetch/fetch_exec/src/fetch_exec.cpp @@ -63,7 +63,7 @@ static constexpr const int FAIL_CALLBACK_PARAM = 2; namespace OHOS::NetStack::Fetch { std::mutex FetchExec::mutex_; -bool FetchExec::initialized_ = false; +std::atomic FetchExec::initialized_ = false; bool FetchExec::ExecFetch(FetchContext *context) { diff --git a/frameworks/js/napi/net_ssl/async_context/src/cert_context.cpp b/frameworks/js/napi/net_ssl/async_context/src/cert_context.cpp index ffb1d5598dd748ca158a667556a73b535ad6ea27..604f5aba4ba4753188e78fe9e620daf5af89a328 100644 --- a/frameworks/js/napi/net_ssl/async_context/src/cert_context.cpp +++ b/frameworks/js/napi/net_ssl/async_context/src/cert_context.cpp @@ -48,6 +48,7 @@ static const std::map SSL_ERR_MAP = { {SslErrorCode::SSL_X509_V_ERR_CERT_HAS_EXPIRED, "Certificate has expired."}, {SslErrorCode::SSL_X509_V_ERR_CRL_NOT_YET_VALID, "CRL is not yet valid."}, {SslErrorCode::SSL_X509_V_ERR_CRL_HAS_EXPIRED, "CRL has expired."}, + {SslErrorCode::SSL_X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, "unable to get local issuer certificate."}, {SslErrorCode::SSL_X509_V_ERR_CERT_REVOKED, "Certificate has been revoked."}, {SslErrorCode::SSL_X509_V_ERR_INVALID_CA, "Invalid certificate authority (CA)."}, {SslErrorCode::SSL_X509_V_ERR_CERT_UNTRUSTED, "Certificate is untrusted."}, diff --git a/frameworks/native/net_ssl/include/net_ssl_verify_cert.h b/frameworks/native/net_ssl/include/net_ssl_verify_cert.h index 843aa81a7bddd4deddc71f98249af68c3283ba67..98532cd7e8a6f03a4a9798b4ce0d7b4e2d8bd767 100644 --- a/frameworks/native/net_ssl/include/net_ssl_verify_cert.h +++ b/frameworks/native/net_ssl/include/net_ssl_verify_cert.h @@ -56,6 +56,8 @@ enum SslErrorCode { SSL_X509_V_ERR_CERT_HAS_EXPIRED = SSL_ERROR_CODE_BASE + X509_V_ERR_CERT_HAS_EXPIRED, SSL_X509_V_ERR_CRL_NOT_YET_VALID = SSL_ERROR_CODE_BASE + X509_V_ERR_CRL_NOT_YET_VALID, SSL_X509_V_ERR_CRL_HAS_EXPIRED = SSL_ERROR_CODE_BASE + X509_V_ERR_CRL_HAS_EXPIRED, + SSL_X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY = + SSL_ERROR_CODE_BASE + X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, SSL_X509_V_ERR_CERT_REVOKED = SSL_ERROR_CODE_BASE + X509_V_ERR_CERT_REVOKED, SSL_X509_V_ERR_INVALID_CA = SSL_ERROR_CODE_BASE + X509_V_ERR_INVALID_CA, SSL_X509_V_ERR_CERT_UNTRUSTED = SSL_ERROR_CODE_BASE + X509_V_ERR_CERT_UNTRUSTED, @@ -97,6 +99,7 @@ static const std::multiset SslErrorCodeSetSinceAPI12{SSL_NONE_ERR, SSL_X509_V_ERR_CERT_HAS_EXPIRED, SSL_X509_V_ERR_CRL_NOT_YET_VALID, SSL_X509_V_ERR_CRL_HAS_EXPIRED, + SSL_X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, SSL_X509_V_ERR_CERT_REVOKED, SSL_X509_V_ERR_INVALID_CA, SSL_X509_V_ERR_CERT_UNTRUSTED,