From 754252f2205b866433b602679e468ee381896453 Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 28 Aug 2018 02:06:56 +0300 Subject: [PATCH] Fix and improve create_openssl_error. GitOrigin-RevId: 039a5da5f3b2f4aafbf60ca541699f3e47fbb6b5 --- tdnet/td/net/SslStream.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tdnet/td/net/SslStream.cpp b/tdnet/td/net/SslStream.cpp index 4d1c41d43..23d7d601d 100644 --- a/tdnet/td/net/SslStream.cpp +++ b/tdnet/td/net/SslStream.cpp @@ -140,15 +140,19 @@ int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) { } Status create_openssl_error(int code, Slice message) { - const int buf_size = 1 << 12; - auto buf = StackAllocator::alloc(buf_size); - StringBuilder sb(buf.as_slice()); + const int max_result_size = 1 << 12; + auto result = StackAllocator::alloc(max_result_size); + StringBuilder sb(result.as_slice()); sb << message; while (unsigned long error_code = ERR_get_error()) { - sb << "{" << error_code << ", " << ERR_error_string(error_code, nullptr) << "}"; + char error_buf[1024]; + ERR_error_string_n(error_code, error_buf, sizeof(error_buf)); + Slice error(error_buf, std::strlen(error_buf)); + LOG_IF(ERROR, ends_with(error, "internal error")) << "OpenSSL internal error: " << error; + sb << "{" << error << "}"; } - LOG_IF(ERROR, sb.is_error()) << "OPENSSL error buffer overflow"; + LOG_IF(ERROR, sb.is_error()) << "OpenSSL error buffer overflow"; return Status::Error(code, sb.as_cslice()); }