From f68f51075853f25c5f7951f07b186393e89960c8 Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Mon, 4 Mar 2019 00:00:00 -0500 Subject: [PATCH] postfix-3.5-20190304 --- postfix/HISTORY | 7 +++++++ postfix/src/global/mail_version.h | 2 +- postfix/src/tls/tls_certkey.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/postfix/HISTORY b/postfix/HISTORY index 52751c546..f0de1da82 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -24172,3 +24172,10 @@ Apologies for any names omitted. 20190227 Documentation: strict_smtputf8 in SMTPUTF8_README. + +20190304 + + Bugfix: a reversed test broke TLS configurations that have + the private key and certificate in the same file. Reported + by Mike Kazantsev. Fix by Viktor Dukhovni. File: + tls/tls_certkey.c. diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index aa04858af..0f0147430 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 "20190301" +#define MAIL_RELEASE_DATE "20190304" #define MAIL_VERSION_NUMBER "3.5" #ifdef SNAPSHOT diff --git a/postfix/src/tls/tls_certkey.c b/postfix/src/tls/tls_certkey.c index 9568c79de..182f2f734 100644 --- a/postfix/src/tls/tls_certkey.c +++ b/postfix/src/tls/tls_certkey.c @@ -589,7 +589,7 @@ static int set_cert_stuff(SSL_CTX *ctx, const char *cert_type, * single pass, avoiding potential race conditions during key rollover. */ if (strcmp(cert_file, key_file) == 0) - return (load_mixed_file(ctx, cert_file)); + return (load_mixed_file(ctx, cert_file) == 0); /* * We need both the private key (in key_file) and the public key -- 2.47.3