From: Iwan Timmer <irtimmer@gmail.com>
Date: Sat, 15 Jun 2019 19:56:45 +0000 (+0200)
Subject: Revert "resolved: Fix incorrect use of OpenSSL BUF_MEM"
X-Git-Tag: v243-rc1~282^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53d64ebb304599995bf7b1fc6b9b54dc3c8421fd;p=thirdparty%2Fsystemd.git

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.
---

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 <openssl/bio.h>
 #include <openssl/err.h>
-#include <string.h>
 
 #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;
                         }