2
0
mirror of https://github.com/vdukhovni/postfix synced 2025-08-30 05:38:06 +00:00

postfix-3.5-20190221

This commit is contained in:
Wietse Venema 2019-02-21 00:00:00 -05:00 committed by Viktor Dukhovni
parent bc7be0f7d4
commit 2399e9e179
3 changed files with 3 additions and 2 deletions

View File

@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no * Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only. * patchlevel; they change the release date only.
*/ */
#define MAIL_RELEASE_DATE "20190219" #define MAIL_RELEASE_DATE "20190221"
#define MAIL_VERSION_NUMBER "3.5" #define MAIL_VERSION_NUMBER "3.5"
#ifdef SNAPSHOT #ifdef SNAPSHOT

View File

@ -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 * 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 * declining the extension), and nothing bad happened, declining it
* explicitly should be safe. * explicitly should be safe.
*/ */

View File

@ -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->ctx = state->appl_state;
state->client_start_props->fd = state->ciphertext_fd; 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) if (!TLS_DANE_BASED(state->client_start_props->tls_level)
|| tls_dane_avail()) || tls_dane_avail())
state->tls_context = tls_client_start(state->client_start_props); state->tls_context = tls_client_start(state->client_start_props);