system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #12802 from irtimmer/fix-openssl

Browse source 
resolved: fix DNS-over-TLS when using OpenSSL
This commit is contained in:
Yu Watanabe 2019-06-17 10:19:50 +09:00 committed by GitHub
parent 4b381a9ef6 ab8cd6c968
commit 3d3dcc6aa9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/resolve/resolved-dnstls-openssl.c
View file

@ -6,7 +6,6 @@
#include <openssl/bio.h>
#include <openssl/err.h>
#include <string.h>
#include "io-util.h"
#include "resolved-dns-stream.h"
@ -21,12 +20,12 @@ static int dnstls_flush_write_buffer(DnsStream *stream) {
assert(stream);
assert(stream->encrypted);
if (stream->dnstls_data.write_buffer->length > 0) {
if (stream->dnstls_data.buffer_offset < stream->dnstls_data.write_buffer->length) {
assert(stream->dnstls_data.write_buffer->data);
struct iovec iov[1];
iov[0] = IOVEC_MAKE(stream->dnstls_data.write_buffer->data,
stream->dnstls_data.write_buffer->length);
iov[0] = IOVEC_MAKE(stream->dnstls_data.write_buffer->data + stream->dnstls_data.buffer_offset,
stream->dnstls_data.write_buffer->length - stream->dnstls_data.buffer_offset);
ss = dns_stream_writev(stream, iov, 1, DNS_STREAM_WRITE_TLS_DATA);
if (ss < 0) {
if (ss == -EAGAIN)
@ -34,14 +33,14 @@ static int dnstls_flush_write_buffer(DnsStream *stream) {
return ss;
} else {
stream->dnstls_data.write_buffer->length -= ss;
stream->dnstls_data.buffer_offset += 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);
if (stream->dnstls_data.buffer_offset < stream->dnstls_data.write_buffer->length) {
stream->dnstls_events |= EPOLLOUT;
return -EAGAIN;
} else {
BIO_reset(SSL_get_wbio(stream->dnstls_data.ssl));
stream->dnstls_data.buffer_offset = 0;
}
}
}
@ -66,6 +65,7 @@ int dnstls_stream_connect_tls(DnsStream *stream, DnsServer *server) {
return -ENOMEM;
BIO_get_mem_ptr(wb, &stream->dnstls_data.write_buffer);
stream->dnstls_data.buffer_offset = 0;
s = SSL_new(server->dnstls_data.ctx);
if (!s)
@ -89,12 +89,13 @@ int dnstls_stream_connect_tls(DnsStream *stream, DnsServer *server) {
}
stream->encrypted = true;
stream->dnstls_data.ssl = TAKE_PTR(s);
r = dnstls_flush_write_buffer(stream);
if (r < 0 && r != -EAGAIN)
if (r < 0 && r != -EAGAIN) {
SSL_free(TAKE_PTR(stream->dnstls_data.ssl));
return r;
stream->dnstls_data.ssl = TAKE_PTR(s);
}
return 0;
}

1
src/resolve/resolved-dnstls-openssl.h
View file

@ -18,4 +18,5 @@ struct DnsTlsStreamData {
bool shutdown;
SSL *ssl;
BUF_MEM *write_buffer;
size_t buffer_offset;
};