From 2399e9e179ee025d03155fa3637cccab0a23ddce Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Thu, 21 Feb 2019 00:00:00 -0500 Subject: [PATCH] postfix-3.5-20190221 --- postfix/src/global/mail_version.h | 2 +- postfix/src/tls/tls_misc.c | 2 +- postfix/src/tlsproxy/tlsproxy.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 1479c9423..654ea75f8 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20190219" +#define MAIL_RELEASE_DATE "20190221" #define MAIL_VERSION_NUMBER "3.5" #ifdef SNAPSHOT diff --git a/postfix/src/tls/tls_misc.c b/postfix/src/tls/tls_misc.c index 00a8567be..a28623af5 100644 --- a/postfix/src/tls/tls_misc.c +++ b/postfix/src/tls/tls_misc.c @@ -701,7 +701,7 @@ static int server_sni_callback(SSL *ssl, int *alert, void *arg) /* * XXX: We could lie and pretend to accept the name, but since we've - * previously not impemented the callback (with OpenSSL then + * previously not implemented the callback (with OpenSSL then * declining the extension), and nothing bad happened, declining it * explicitly should be safe. */ diff --git a/postfix/src/tlsproxy/tlsproxy.c b/postfix/src/tlsproxy/tlsproxy.c index f30c0d0db..7339da6b9 100644 --- a/postfix/src/tlsproxy/tlsproxy.c +++ b/postfix/src/tlsproxy/tlsproxy.c @@ -946,6 +946,7 @@ static int tlsp_client_start_pre_handshake(TLSP_STATE *state) { state->client_start_props->ctx = state->appl_state; state->client_start_props->fd = state->ciphertext_fd; + /* These predicates and warning belong inside tls_client_start(). */ if (!TLS_DANE_BASED(state->client_start_props->tls_level) || tls_dane_avail()) state->tls_context = tls_client_start(state->client_start_props);