Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tls/ossl: Adjusted value of ERROR_UNEXPECTED_PACKET #163

Open
wants to merge 1 commit into
base: v24.2.x
Choose a base branch
from
+16 −1
Open

tls/ossl: Adjusted value of ERROR_UNEXPECTED_PACKET #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/net/ossl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,22 @@ struct is_error_code_enum<seastar::ossl_errc> : true_type {};

template<>
struct fmt::formatter<seastar::ossl_errc> : public fmt::formatter<std::string_view> {
/**
* Some OpenSSL errors are hard to parse. This method can be used to provide
* an alternative, more readable, error message.
*/
static std::optional<seastar::sstring> alternate_message(unsigned long error) {
if (error == seastar::tls::ERROR_UNEXPECTED_PACKET) {
return "Wrong SSL Version number: ensure client is configured to use TLS";
}

return std::nullopt;
}
auto format(seastar::ossl_errc error, fmt::format_context& ctx) const -> decltype(ctx.out()) {
auto alternate = alternate_message(static_cast<unsigned long>(error));
if (alternate.has_value()) {
return fmt::format_to(ctx.out(), "{}", alternate.value());
}
constexpr size_t error_buf_size = 256;
// Buffer passed to ERR_error_string must be at least 256 bytes large
// https://www.openssl.org/docs/man3.0/man3/ERR_error_string_n.html
Expand Down Expand Up @@ -2068,7 +2083,7 @@ const int seastar::tls::ERROR_PUSH = int(ERR_SYSTEM_FLAG | EPIPE);
const int seastar::tls::ERROR_PULL = ERR_PACK(
ERR_LIB_SSL, 0, SSL_R_READ_BIO_NOT_SET);
const int seastar::tls::ERROR_UNEXPECTED_PACKET = ERR_PACK(
ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_MESSAGE);
ERR_LIB_SSL, 0, SSL_R_WRONG_VERSION_NUMBER);
const int seastar::tls::ERROR_UNSUPPORTED_VERSION = ERR_PACK(
ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_SSL_VERSION);
const int seastar::tls::ERROR_NO_CIPHER_SUITES = ERR_PACK(
Expand Down