postfix-3.5-20190304

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 52751c5460f221ab85a94674583915fba9998b58..f0de1da82319e6a0698ac5ec911ae06e395ae3ba 100644 (file)
--- 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 aa04858af8b73060af3e987ca39dbe67ee60a584..0f0147430a62a9cecd751c6922758e6206768bd4 100644 (file)
--- 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 9568c79ded74f01883b1df8ed5838b11887d73b7..182f2f7341d07d90e5ec070ec88bf644bc778fe6 100644 (file)
--- 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