From 53d64ebb304599995bf7b1fc6b9b54dc3c8421fd Mon Sep 17 00:00:00 2001 From: Iwan Timmer Date: Sat, 15 Jun 2019 21:56:45 +0200 Subject: [PATCH] Revert "resolved: Fix incorrect use of OpenSSL BUF_MEM" This reverts commit 18bddeaaf225d5becfc10cd2c6a1d037c90574a2. Revert this because it does not take the OpenSSL internal read pointer into considoration. Resulting in padding in packetdata and therefore broken SSL connections. --- src/resolve/resolved-dnstls-openssl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/resolve/resolved-dnstls-openssl.c b/src/resolve/resolved-dnstls-openssl.c index 5d922300758..f269e4d6487 100644 --- a/src/resolve/resolved-dnstls-openssl.c +++ b/src/resolve/resolved-dnstls-openssl.c @@ -6,7 +6,6 @@ #include #include -#include #include "io-util.h" #include "resolved-dns-stream.h" @@ -35,11 +34,9 @@ static int dnstls_flush_write_buffer(DnsStream *stream) { return ss; } else { stream->dnstls_data.write_buffer->length -= ss; + stream->dnstls_data.write_buffer->data += ss; if (stream->dnstls_data.write_buffer->length > 0) { - memmove(stream->dnstls_data.write_buffer->data, - stream->dnstls_data.write_buffer->data + ss, - stream->dnstls_data.write_buffer->length); stream->dnstls_events |= EPOLLOUT; return -EAGAIN; } -- 2.39.2