From 1b53e0968d329557c1b7ed00f50a6be5efbb2a58 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Tue, 12 Jan 2021 09:38:50 +0100 Subject: [PATCH] OpenSSL ssl_recv_data(): Include the actual fd in an error message --- openssl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openssl.c b/openssl.c index e87e997b..cfcc59e8 100644 --- a/openssl.c +++ b/openssl.c @@ -229,6 +229,11 @@ extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t m ret = BIO_read(bio, buf, (int)max_length); } while (ret <= 0 && BIO_should_retry(bio)); + if (BIO_get_ssl(bio, &ssl) == 1) + { + fd = SSL_get_fd(ssl); + } + if (ret < 0) { log_ssl_errors(LOG_LEVEL_ERROR, @@ -237,11 +242,6 @@ extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t m return -1; } - if (BIO_get_ssl(bio, &ssl) == 1) - { - fd = SSL_get_fd(ssl); - } - log_error(LOG_LEVEL_RECEIVED, "TLS from socket %d: %N", fd, ret, buf); -- 2.39.2