diff --git a/core/include/userver/tracing/span.hpp b/core/include/userver/tracing/span.hpp index d4663ecb5e7f..7ebceb2d6905 100644 --- a/core/include/userver/tracing/span.hpp +++ b/core/include/userver/tracing/span.hpp @@ -22,7 +22,7 @@ class SpanBuilder; /// @brief Measures the execution time of the current code block, links it with /// the parent tracing::Spans and stores that info in the log. /// -/// Logging of spans can be controled at runtime via @ref USERVER_NO_LOG_SPANS. +/// Logging of spans can be controlled at runtime via @ref USERVER_NO_LOG_SPANS. /// /// See @ref scripts/docs/en/userver/logging.md for usage examples and more /// descriptions. diff --git a/core/include/userver/utils/statistics/labels.hpp b/core/include/userver/utils/statistics/labels.hpp index a9b5a4ccf294..b5073e2f2fd3 100644 --- a/core/include/userver/utils/statistics/labels.hpp +++ b/core/include/userver/utils/statistics/labels.hpp @@ -22,7 +22,7 @@ class LabelView final { LabelView(Label&& label) = delete; explicit LabelView(const Label& label); constexpr LabelView(std::string_view name, std::string_view value) : name_(name), value_(value) { - UINVARIANT(!name_.empty(), "The lable name must not be empty."); + UINVARIANT(!name_.empty(), "The label name must not be empty."); } template >* = nullptr> diff --git a/core/src/clients/http/client_crl_test.cpp b/core/src/clients/http/client_crl_test.cpp index 4da4af3c8278..2efaecbdc819 100644 --- a/core/src/clients/http/client_crl_test.cpp +++ b/core/src/clients/http/client_crl_test.cpp @@ -317,7 +317,7 @@ struct TlsServer { auto tls_server = engine::io::TlsWrapper::StartTlsServer( std::move(socket), - crypto::LoadCertficatesChainFromString(kServerCertificate), + crypto::LoadCertificatesChainFromString(kServerCertificate), crypto::PrivateKey::LoadFromString(kRevokedServerPrivateKey), deadline, cas diff --git a/core/src/engine/io/tls_wrapper_benchmark.cpp b/core/src/engine/io/tls_wrapper_benchmark.cpp index 193fe117fb47..7674f9a88454 100644 --- a/core/src/engine/io/tls_wrapper_benchmark.cpp +++ b/core/src/engine/io/tls_wrapper_benchmark.cpp @@ -97,7 +97,7 @@ constexpr auto kDeadlineMaxTime = std::chrono::seconds{60}; [&reading, deadline](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), deadline ); @@ -141,7 +141,7 @@ BENCHMARK(tls_write_all_buffered)->RangeMultiplier(2)->Range(1 << 6, 1 << 12)->U [&reading, deadline](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), deadline ); diff --git a/core/src/engine/io/tls_wrapper_test.cpp b/core/src/engine/io/tls_wrapper_test.cpp index fd0bf3d06a40..37a26d9b23ff 100644 --- a/core/src/engine/io/tls_wrapper_test.cpp +++ b/core/src/engine/io/tls_wrapper_test.cpp @@ -234,7 +234,7 @@ UTEST(TlsWrapper, InitListSmall) { [deadline, kDataA, kDataB, kDataC, kDataD](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert_chain), + crypto::LoadCertificatesChainFromString(cert_chain), crypto::PrivateKey::LoadFromString(chain_private_key), deadline ); @@ -274,7 +274,7 @@ UTEST(TlsWrapper, InitListLarge) { [deadline, kDataA, kDataB, kDataC, kDataD](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), deadline ); @@ -310,7 +310,7 @@ UTEST(TlsWrapper, InitListSmallThenLarge) { [deadline, kDataSmall, kDataLarge](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), deadline ); @@ -342,7 +342,7 @@ UTEST_MT(TlsWrapper, Smoke, 2) { try { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), test_deadline ); @@ -389,7 +389,7 @@ UTEST_MT(TlsWrapper, DocTest, 2) { [deadline](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), deadline ); @@ -421,7 +421,7 @@ UTEST(TlsWrapper, Move) { try { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), test_deadline ); @@ -471,7 +471,7 @@ UTEST(TlsWrapper, ConnectTimeout) { EXPECT_THROW( static_cast(io::TlsWrapper::StartTlsServer( std::move(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), Deadline::FromDuration(kShortTimeout) )), @@ -490,7 +490,7 @@ UTEST_MT(TlsWrapper, IoTimeout, 2) { [test_deadline, &timeout_happened](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), test_deadline ); @@ -527,7 +527,7 @@ UTEST(TlsWrapper, Cancel) { [test_deadline](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), test_deadline ); @@ -554,7 +554,7 @@ UTEST_MT(TlsWrapper, CertKeyMismatch, 2) { UEXPECT_THROW( static_cast(io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(other_key), test_deadline )), @@ -581,7 +581,7 @@ UTEST_MT(TlsWrapper, NonTlsClient, 2) { UEXPECT_THROW( static_cast(io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(other_key), test_deadline )), @@ -622,7 +622,7 @@ UTEST_MT(TlsWrapper, DoubleSmoke, 4) { [test_deadline](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), test_deadline ); @@ -643,7 +643,7 @@ UTEST_MT(TlsWrapper, DoubleSmoke, 4) { [test_deadline](auto&& server) { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(other_cert), + crypto::LoadCertificatesChainFromString(other_cert), crypto::PrivateKey::LoadFromString(other_key), test_deadline ); @@ -696,7 +696,7 @@ UTEST(TlsWrapper, InvalidSocket) { UEXPECT_THROW(static_cast(io::TlsWrapper::StartTlsClient({}, {}, test_deadline)), io::TlsException); UEXPECT_THROW( static_cast(io::TlsWrapper::StartTlsServer( - {}, crypto::LoadCertficatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), test_deadline + {}, crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), test_deadline )), io::TlsException ); @@ -713,7 +713,7 @@ UTEST(TlsWrapper, PeerShutdown) { try { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), test_deadline ); @@ -755,7 +755,7 @@ UTEST(TlsWrapper, PeerDisconnect) { try { auto tls_server = io::TlsWrapper::StartTlsServer( std::forward(server), - crypto::LoadCertficatesChainFromString(cert), + crypto::LoadCertificatesChainFromString(cert), crypto::PrivateKey::LoadFromString(key), test_deadline ); diff --git a/core/src/server/net/listener_config.cpp b/core/src/server/net/listener_config.cpp index 4d2d3dadc478..59475aa6609a 100644 --- a/core/src/server/net/listener_config.cpp +++ b/core/src/server/net/listener_config.cpp @@ -35,7 +35,7 @@ PortConfig Parse(const yaml_config::YamlConfig& value, formats::parse::To; /// list of 'Certificate's. /// /// @throw crypto::KeyParseError if failed to load the certificate. -CertificatesChain LoadCertficatesChainFromString(std::string_view chain); +CertificatesChain LoadCertificatesChainFromString(std::string_view chain); } // namespace crypto diff --git a/universal/src/crypto/certificate.cpp b/universal/src/crypto/certificate.cpp index ef79d807ebf5..dd100c054650 100644 --- a/universal/src/crypto/certificate.cpp +++ b/universal/src/crypto/certificate.cpp @@ -56,7 +56,7 @@ Certificate Certificate::LoadFromString(std::string_view certificate) { return Certificate{std::move(cert)}; } -CertificatesChain LoadCertficatesChainFromString(std::string_view chain) { +CertificatesChain LoadCertificatesChainFromString(std::string_view chain) { CertificatesChain certificates; constexpr std::string_view kBeginMarker = "-----BEGIN CERTIFICATE-----"; constexpr std::string_view kEndMarker = "-----END CERTIFICATE-----";