Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2012-05-08 12:28:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix", Maintainer is "varkoly@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2012-04-23 16:12:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2012-05-08 12:28:56.000000000 +0200 @@ -1,0 +2,31 @@ +Thu May 3 16:47:11 UTC 2012 - chris@computersalat.de + +- update to 2.8.10 + * 20120401 + Bitrot: shut up useless warnings about Cyrus SASL call-back + function pointer type mis-matches. Files: xsasl/xsasl_cyrus.h, + xsasl/xsasl_cyrus_server.c, xsasl/xsasl_client.c. + * 20120422 + Bit-rot: OpenSSL 1.0.1 introduces new protocols. Update the + known TLS protocol list so that protocols can be turned off + selectively to work around implementation bugs. Based on + a patch by Victor Duchovni. Files: proto/TLS_README.html, + proto/postconf.proto, tls/tls.h, tls/tls_misc.c, tls/tls_client.c, + tls/tls_server.c. +- update to 2.8.9 + * 20120217 + Cleanup: missing #include statement for bugfix code added + 20111226. File: local/unknown.c. + * 20120214 + Bugfix (introduced: Postfix 2.4): extraneous null assignment + caused core dump when postlog emitted the "usage" message. + Reported by Kant (fnord.hammer). File: postlog/postlog.c. + * 20120202 + Bugfix (introduced: Postfix 2.3): the "change header" milter + request could replace the wrong header. A long header name + could match a shorter one, because a length check was done + on the wrong string. Reported by Vladimir Vassiliev. File: + cleanup/cleanup_milter.c. +- use latest VDA patch (2.8.9) + +------------------------------------------------------------------- Old: ---- postfix-2.8.8.tar.bz2 postfix-vda-v10-2.8.5.patch New: ---- postfix-2.8.10.tar.bz2 postfix-vda-v10-2.8.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.gpTkYW/_old 2012-05-08 12:28:58.000000000 +0200 +++ /var/tmp/diff_new_pack.gpTkYW/_new 2012-05-08 12:28:58.000000000 +0200 @@ -20,7 +20,7 @@ Summary: A fast, secure, and flexible mailer License: IPL-1.0 Group: Productivity/Networking/Email/Servers -Version: 2.8.8 +Version: 2.8.10 Release: 0 Url: http://www.postfix.org/ Source: %{name}-%{version}.tar.bz2 @@ -35,7 +35,7 @@ Patch10: %{name}-2.8.3-main.cf.patch Patch11: %{name}-2.8.3-master.cf.patch Patch12: %{name}-2.8.3-post-install.patch -Patch20: %{name}-vda-v10-2.8.5.patch +Patch20: %{name}-vda-v10-2.8.9.patch Patch21: postfix-2.8.5-ssl-release-buffers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq ++++++ postfix-2.8.8.tar.bz2 -> postfix-2.8.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/HISTORY new/postfix-2.8.10/HISTORY --- old/postfix-2.8.8/HISTORY 2012-01-31 22:13:45.000000000 +0100 +++ new/postfix-2.8.10/HISTORY 2012-04-24 19:35:34.000000000 +0200 @@ -16747,3 +16747,37 @@ have been updated when it was re-purposed to handle DSN SUCCESS notifications. Problem reported by Sabahattin Gucukoglu. File: bounce/bounce_trace_service.c. + +20120202 + + Bugfix (introduced: Postfix 2.3): the "change header" milter + request could replace the wrong header. A long header name + could match a shorter one, because a length check was done + on the wrong string. Reported by Vladimir Vassiliev. File: + cleanup/cleanup_milter.c. + +20120214 + + Bugfix (introduced: Postfix 2.4): extraneous null assignment + caused core dump when postlog emitted the "usage" message. + Reported by Kant (fnord.hammer). File: postlog/postlog.c. + +20120217 + + Cleanup: missing #include statement for bugfix code added + 20111226. File: local/unknown.c. + +20120401 + + Bitrot: shut up useless warnings about Cyrus SASL call-back + function pointer type mis-matches. Files: xsasl/xsasl_cyrus.h, + xsasl/xsasl_cyrus_server.c, xsasl/xsasl_client.c. + +20120422 + + Bit-rot: OpenSSL 1.0.1 introduces new protocols. Update the + known TLS protocol list so that protocols can be turned off + selectively to work around implementation bugs. Based on + a patch by Victor Duchovni. Files: proto/TLS_README.html, + proto/postconf.proto, tls/tls.h, tls/tls_misc.c, tls/tls_client.c, + tls/tls_server.c. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/README_FILES/TLS_README new/postfix-2.8.10/README_FILES/TLS_README --- old/postfix-2.8.8/README_FILES/TLS_README 2010-12-31 02:41:17.000000000 +0100 +++ new/postfix-2.8.10/README_FILES/TLS_README 2012-04-24 21:20:48.000000000 +0200 @@ -542,11 +542,17 @@ control over the minimum cipher grade for opportunistic TLS. With Postfix < 2.6, the minimum opportunistic TLS cipher grade is always "export". -With mandatory TLS encryption, the Postfix SMTP server will by default only use -SSLv3 or TLSv1. SSLv2 is only used when TLS encryption is optional. The -mandatory TLS protocol list is specified via the smtpd_tls_mandatory_protocols -configuration parameter. The corresponding smtpd_tls_protocols parameter -(Postfix >= 2.6) controls the SSL/TLS protocols used with opportunistic TLS. +With mandatory TLS encryption, the Postfix SMTP server will by default disable +SSLv2. SSLv2 is used only when TLS encryption is optional. The mandatory TLS +protocol list is specified via the smtpd_tls_mandatory_protocols configuration +parameter. The corresponding smtpd_tls_protocols parameter (Postfix >= 2.6) +controls the SSL/TLS protocols used with opportunistic TLS. + +Note that the OpenSSL library only supports protocol exclusion (not inclusion). +For this reason, Postfix can exclude only protocols that are known at the time +the Postfix software is written. If new protocols are added to the OpenSSL +library, they cannot be excluded without corresponding changes to the Postfix +source code. For a server that is not a public Internet MX host, Postfix (>= 2.3) supports configurations with no server certificates that use oonnllyy the anonymous ciphers. @@ -561,9 +567,10 @@ smtpd_tls_mandatory_ciphers = high smtpd_tls_mandatory_exclude_ciphers = aNULL, MD5 smtpd_tls_security_level = encrypt - smtpd_tls_mandatory_protocols = TLSv1 - # Also available with Postfix >= 2.5: + # Preferred form with Postfix >= 2.5: smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3 + # Alternative form. + smtpd_tls_mandatory_protocols = TLSv1 If you want to take advantage of ciphers with ephemeral Diffie-Hellman (EDH) key exchange (this offers "forward-secrecy"), DH parameters are needed. Instead @@ -594,9 +601,9 @@ smtpd_tls_eecdh_grade = strong Postfix 2.8 and later, in combination with OpenSSL 0.9.7 and later allows TLS -servers to preempt the TLS client's cipher preference list. This is only -possible with SSLv3, as in SSLv2 the client chooses the cipher from a list -supplied by the server. +servers to preempt the TLS client's cipher preference list. This is possible +only with SSLv3 and later, as in SSLv2 the client chooses the cipher from a +list supplied by the server. By default, the OpenSSL server selects the client's most preferred cipher that the server supports. With SSLv3 and later, the server may choose its own most @@ -1048,9 +1055,9 @@ Examples: In the example below, traffic to example.com and its sub-domains via the -corresponding MX hosts always uses TLS. The protocol version will be "SSLv3" or -"TLSv1" (the default setting of smtp_tls_mandatory_protocols excludes "SSLv2"). -Only high or medium strength (i.e. 128 bit or better) ciphers will be used by +corresponding MX hosts always uses TLS. The SSLv2 protocol will be disabled +(the default setting of smtp_tls_mandatory_protocols excludes "SSLv2"). Only +high- or medium-strength (i.e. 128 bit or better) ciphers will be used by default for all "encrypt" security level sessions. /etc/postfix/main.cf: @@ -1714,11 +1721,11 @@ control over the minimum cipher grade for opportunistic TLS. With Postfix < 2.6, the minimum opportunistic TLS cipher grade is always "export". -With mandatory TLS encryption, the Postfix SMTP client will by default only use -SSLv3 or TLSv1. SSLv2 is only used when TLS encryption is optional. The -mandatory TLS protocol list is specified via the smtp_tls_mandatory_protocols -configuration parameter. The corresponding smtp_tls_protocols parameter -(Postfix >= 2.6) controls the SSL/TLS protocols used with opportunistic TLS. +With mandatory TLS encryption, the Postfix SMTP client will by default disable +SSLv2. SSLv2 is used only when TLS encryption is optional. The mandatory TLS +protocol list is specified via the smtp_tls_mandatory_protocols configuration +parameter. The corresponding smtp_tls_protocols parameter (Postfix >= 2.6) +controls the SSL/TLS protocols used with opportunistic TLS. Example: @@ -1726,9 +1733,10 @@ smtp_tls_mandatory_ciphers = medium smtp_tls_mandatory_exclude_ciphers = RC4, MD5 smtp_tls_exclude_ciphers = aNULL - smtp_tls_mandatory_protocols = SSLv3, TLSv1 - # Also available with Postfix >= 2.5: + # Preferred form with Postfix >= 2.5: smtp_tls_mandatory_protocols = !SSLv2 + # Alternative form. + smtp_tls_mandatory_protocols = SSLv3, TLSv1 # Also available with Postfix >= 2.6: smtp_tls_ciphers = export smtp_tls_protocols = !SSLv2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/RELEASE_NOTES new/postfix-2.8.10/RELEASE_NOTES --- old/postfix-2.8.8/RELEASE_NOTES 2011-03-16 16:00:05.000000000 +0100 +++ new/postfix-2.8.10/RELEASE_NOTES 2012-04-24 21:58:33.000000000 +0200 @@ -11,6 +11,43 @@ The mail_release_date configuration parameter (format: yyyymmdd) specifies the release date of a stable release or snapshot release. +Major changes with Postfix 2.8.10 +--------------------------------- + +This release adds support to turn off the TLSv1.1 and TLSv1.2 +protocols. Introduced with OpenSSL version 1.0.1, these are known +to cause inter-operability problems with for example hotmail. + +The radical workaround is to temporarily turn off problematic +protocols globally: + +/etc/postfix/main.cf: + smtp_tls_protocols = !SSLv2, !TLSv1.1, !TLSv1.2 + smtp_tls_mandatory_protocols = !SSLv2, !TLSv1.1, !TLSv1.2 + + smtpd_tls_protocols = !SSLv2, !TLSv1.1, !TLSv1.2 + smtpd_tls_mandatory_protocols = !SSLv2, !TLSv1.1, !TLSv1.2 + +However, it may be better to temporarily turn off problematic +protocols for broken sites only: + +/etc/postfix/main.cf: + smtp_tls_policy_maps = hash:/etc/postfix/tls_policy + +/etc/postfix/tls_policy: + example.com may protocols=!SSLv2:!TLSv1.1:!TLSv1.2 + +Important: + +- Note the use of ":" instead of comma or space. Also, note that + there is NO space around the "=" in "protocols=". + +- The smtp_tls_policy_maps lookup key must match the "next-hop" + destination that is given to the Postfix SMTP client. If you + override the next-hop destination with transport_maps, relayhost, + sender_dependent_relayhost_maps, or otherwise, you need to specify + the same destination for the smtp_tls_policy_maps lookup key. + Incompatible changes with Postfix 2.8.2 --------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/html/TLS_README.html new/postfix-2.8.10/html/TLS_README.html --- old/postfix-2.8.8/html/TLS_README.html 2011-06-07 02:05:24.000000000 +0200 +++ new/postfix-2.8.10/html/TLS_README.html 2012-04-24 21:20:46.000000000 +0200 @@ -790,12 +790,18 @@ "export". </p> <p> With mandatory TLS encryption, the Postfix SMTP server will by -default only use SSLv3 or TLSv1. SSLv2 is only used when TLS encryption +default disable SSLv2. SSLv2 is used only when TLS encryption is optional. The mandatory TLS protocol list is specified via the <a href="postconf.5.html#smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> configuration parameter. The corresponding <a href="postconf.5.html#smtpd_tls_protocols">smtpd_tls_protocols</a> parameter (Postfix ≥ 2.6) controls the SSL/TLS protocols used with opportunistic TLS. </p> +<p> Note that the OpenSSL library only supports protocol exclusion +(not inclusion). For this reason, Postfix can exclude only protocols +that are known at the time the Postfix software is written. If new +protocols are added to the OpenSSL library, they cannot be excluded +without corresponding changes to the Postfix source code. </p> + <p> For a server that is not a public Internet MX host, Postfix (≥ 2.3) supports configurations with no <a href="#server_cert_key">server certificates</a> that use <b>only</b> the anonymous ciphers. This is @@ -813,9 +819,10 @@ <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a> = high <a href="postconf.5.html#smtpd_tls_mandatory_exclude_ciphers">smtpd_tls_mandatory_exclude_ciphers</a> = aNULL, MD5 <a href="postconf.5.html#smtpd_tls_security_level">smtpd_tls_security_level</a> = encrypt - <a href="postconf.5.html#smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> = TLSv1 - # Also available with Postfix ≥ 2.5: + # Preferred form with Postfix ≥ 2.5: <a href="postconf.5.html#smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> = !SSLv2, !SSLv3 + # Alternative form. + <a href="postconf.5.html#smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> = TLSv1 </pre> </blockquote> @@ -859,8 +866,8 @@ <p> Postfix 2.8 and later, in combination with OpenSSL 0.9.7 and later allows TLS servers to preempt the TLS client's cipher preference list. -This is only possible with SSLv3, as in SSLv2 the client chooses the -cipher from a list supplied by the server. </p> +This is possible only with SSLv3 and later, as in SSLv2 the client +chooses the cipher from a list supplied by the server. </p> <p> By default, the OpenSSL server selects the client's most preferred cipher that the server supports. With SSLv3 and later, the server @@ -1455,9 +1462,9 @@ <p> Examples: </p> <p> In the example below, traffic to <i>example.com</i> and its sub-domains -via the corresponding MX hosts always uses TLS. The protocol version will be -"SSLv3" or "TLSv1" (the default setting of <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> -excludes "SSLv2"). Only high or medium strength (i.e. 128 bit or +via the corresponding MX hosts always uses TLS. The SSLv2 protocol +will be disabled (the default setting of <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> +excludes "SSLv2"). Only high- or medium-strength (i.e. 128 bit or better) ciphers will be used by default for all "encrypt" security level sessions. </p> @@ -2306,7 +2313,7 @@ "export". </p> <p> With mandatory TLS encryption, the Postfix SMTP client will by -default only use SSLv3 or TLSv1. SSLv2 is only used when TLS encryption +default disable SSLv2. SSLv2 is used only when TLS encryption is optional. The mandatory TLS protocol list is specified via the <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> configuration parameter. The corresponding <a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> parameter (Postfix ≥ 2.6) controls @@ -2320,9 +2327,10 @@ <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> = medium <a href="postconf.5.html#smtp_tls_mandatory_exclude_ciphers">smtp_tls_mandatory_exclude_ciphers</a> = RC4, MD5 <a href="postconf.5.html#smtp_tls_exclude_ciphers">smtp_tls_exclude_ciphers</a> = aNULL - <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = SSLv3, TLSv1 - # Also available with Postfix ≥ 2.5: + # Preferred form with Postfix ≥ 2.5: <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = !SSLv2 + # Alternative form. + <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = SSLv3, TLSv1 # Also available with Postfix ≥ 2.6: <a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a> = export <a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> = !SSLv2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/html/lmtp.8.html new/postfix-2.8.10/html/lmtp.8.html --- old/postfix-2.8.8/html/lmtp.8.html 2010-12-31 02:19:44.000000000 +0100 +++ new/postfix-2.8.10/html/lmtp.8.html 2012-04-24 21:30:18.000000000 +0200 @@ -455,7 +455,7 @@ non-empty value is specified, this overrides the obsolete <a href="postconf.5.html#smtp_tls_per_site">smtp_tls_per_site</a> parameter. - <b><a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> (SSLv3, TLSv1)</b> + <b><a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> (!SSLv2)</b> List of SSL/TLS protocols that the Postfix SMTP client will use with mandatory TLS encryption. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/html/postconf.5.html new/postfix-2.8.10/html/postconf.5.html --- old/postfix-2.8.8/html/postconf.5.html 2011-06-19 16:24:42.000000000 +0200 +++ new/postfix-2.8.10/html/postconf.5.html 2012-04-24 21:20:47.000000000 +0200 @@ -4582,7 +4582,7 @@ </DD> <DT><b><a name="lmtp_tls_mandatory_protocols">lmtp_tls_mandatory_protocols</a> -(default: SSLv3, TLSv1)</b></DT><DD> +(default: !SSLv2)</b></DT><DD> <p> The LMTP-specific version of the <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> configuration parameter. See there for details. </p> @@ -10692,7 +10692,7 @@ </DD> <DT><b><a name="smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> -(default: SSLv3, TLSv1)</b></DT><DD> +(default: !SSLv2)</b></DT><DD> <p> List of SSL/TLS protocols that the Postfix SMTP client will use with mandatory TLS encryption. In <a href="postconf.5.html">main.cf</a> the values are separated by @@ -10701,12 +10701,19 @@ empty value means allow all protocols. The valid protocol names, (see <b>SSL_get_version(3)</b>), are "SSLv2", "SSLv3" and "TLSv1". </p> +<p> Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. </p> + <p> With Postfix ≥ 2.5 the parameter syntax is expanded to support protocol exclusions. One can now explicitly exclude SSLv2 by setting "<a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = !SSLv2". To exclude both SSLv2 and SSLv3 set "<a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = !SSLv2, !SSLv3". Listing -the protocols to include, rather than protocols to exclude, is still -supported; use the form you find more intuitive. </p> +the protocols to include, rather than protocols to exclude, is +supported, but not recommended. The exclusion form more closely +matches the behaviour when the OpenSSL library is newer than Postfix. +</p> <p> Since SSL version 2 has known protocol weaknesses and is now deprecated, the default setting excludes "SSLv2". This means that by @@ -10719,9 +10726,10 @@ <p> Example: </p> <pre> -<a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = TLSv1 -# Alternative form with Postfix ≥ 2.5: +# Preferred form with Postfix ≥ 2.5: <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = !SSLv2, !SSLv3 +# Alternative form. +<a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = TLSv1 </pre> <p> This feature is available in Postfix 2.3 and later. </p> @@ -10977,14 +10985,18 @@ protocol names, (see <b>SSL_get_version(3)</b>), are "SSLv2", "SSLv3" and "TLSv1". </p> +<p> Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. </p> + <p> To include a protocol list its name, to exclude it, prefix the name with a "!" character. To exclude SSLv2 even for opportunistic TLS set "<a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> = !SSLv2". To exclude both "SSLv2" and "SSLv3" set "<a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> = !SSLv2, !SSLv3". Explicitly listing the protocols to -include, is supported, but not recommended. OpenSSL provides no mechanisms -for excluding protocols not known at compile-time. If Postfix is linked -against an OpenSSL library that supports additional protocol versions, -they cannot be excluded using either syntax. </p> +include, rather than protocols to exclude, is supported, but not +recommended. The exclusion form more closely matches the behaviour +when the OpenSSL library is newer than Postfix. </p> <p> Example: </p> <pre> @@ -14436,7 +14448,7 @@ </DD> <DT><b><a name="smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> -(default: SSLv3, TLSv1)</b></DT><DD> +(default: !SSLv2)</b></DT><DD> <p> The SSL/TLS protocols accepted by the Postfix SMTP server with mandatory TLS encryption. If the list is empty, the server supports all @@ -14445,12 +14457,19 @@ names separated by whitespace, commas or colons. The supported protocol names are "SSLv2", "SSLv3" and "TLSv1", and are not case sensitive. </p> +<p> Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. </p> + <p> With Postfix ≥ 2.5 the parameter syntax is expanded to support protocol exclusions. One can now explicitly exclude SSLv2 by setting "<a href="postconf.5.html#smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> = !SSLv2". To exclude both SSLv2 and SSLv3 set "<a href="postconf.5.html#smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> = !SSLv2, !SSLv3". Listing -the protocols to include, rather than protocols to exclude, is still -supported, use the form you find more intuitive. </p> +the protocols to include, rather than protocols to exclude, is +supported, but not recommended. The exclusion form more closely +matches the behaviour when the OpenSSL library is newer than Postfix. +</p> <p> Since SSL version 2 has known protocol weaknesses and is now deprecated, the default setting excludes "SSLv2". This means that @@ -14484,14 +14503,18 @@ "TLSv1". In <a href="postconf.5.html#smtp_tls_policy_maps">smtp_tls_policy_maps</a> table entries, "protocols" attribute values are separated by a colon. </p> +<p> Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. </p> + <p> To include a protocol list its name, to exclude it, prefix the name with a "!" character. To exclude SSLv2 even for opportunistic TLS set "<a href="postconf.5.html#smtpd_tls_protocols">smtpd_tls_protocols</a> = !SSLv2". To exclude both "SSLv2" and "SSLv3" set "<a href="postconf.5.html#smtpd_tls_protocols">smtpd_tls_protocols</a> = !SSLv2, !SSLv3". Explicitly listing the protocols to -include, is supported, but not recommended. OpenSSL provides no mechanisms -for excluding protocols not known at compile-time. If Postfix is linked -against an OpenSSL library that supports additional protocol versions, -they cannot be excluded using either syntax. </p> +include, rather than protocols to exclude, is supported, but not +recommended. The exclusion form more closely matches the behaviour +when the OpenSSL library is newer than Postfix. </p> <p> Example: </p> <pre> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/html/smtp.8.html new/postfix-2.8.10/html/smtp.8.html --- old/postfix-2.8.8/html/smtp.8.html 2010-12-31 02:19:44.000000000 +0100 +++ new/postfix-2.8.10/html/smtp.8.html 2012-04-24 21:30:18.000000000 +0200 @@ -455,7 +455,7 @@ non-empty value is specified, this overrides the obsolete <a href="postconf.5.html#smtp_tls_per_site">smtp_tls_per_site</a> parameter. - <b><a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> (SSLv3, TLSv1)</b> + <b><a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> (!SSLv2)</b> List of SSL/TLS protocols that the Postfix SMTP client will use with mandatory TLS encryption. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/html/smtpd.8.html new/postfix-2.8.10/html/smtpd.8.html --- old/postfix-2.8.8/html/smtpd.8.html 2011-11-05 20:18:46.000000000 +0100 +++ new/postfix-2.8.10/html/smtpd.8.html 2012-04-24 21:30:19.000000000 +0200 @@ -462,7 +462,7 @@ exclude from the SMTP server cipher list at manda- tory TLS security levels. - <b><a href="postconf.5.html#smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> (SSLv3, TLSv1)</b> + <b><a href="postconf.5.html#smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> (!SSLv2)</b> The SSL/TLS protocols accepted by the Postfix SMTP server with mandatory TLS encryption. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/man/man5/postconf.5 new/postfix-2.8.10/man/man5/postconf.5 --- old/postfix-2.8.8/man/man5/postconf.5 2011-06-19 16:24:42.000000000 +0200 +++ new/postfix-2.8.10/man/man5/postconf.5 2012-04-24 21:20:48.000000000 +0200 @@ -2485,7 +2485,7 @@ configuration parameter. See there for details. .PP This feature is available in Postfix 2.3 and later. -.SH lmtp_tls_mandatory_protocols (default: SSLv3, TLSv1) +.SH lmtp_tls_mandatory_protocols (default: !SSLv2) The LMTP-specific version of the smtp_tls_mandatory_protocols configuration parameter. See there for details. .PP @@ -6359,7 +6359,7 @@ attribute. See smtp_tls_policy_maps for notes and examples. .PP This feature is available in Postfix 2.3 and later. -.SH smtp_tls_mandatory_protocols (default: SSLv3, TLSv1) +.SH smtp_tls_mandatory_protocols (default: !SSLv2) List of SSL/TLS protocols that the Postfix SMTP client will use with mandatory TLS encryption. In main.cf the values are separated by whitespace, commas or colons. In the policy table "protocols" attribute @@ -6367,12 +6367,18 @@ empty value means allow all protocols. The valid protocol names, (see \fBfBSSL_get_version\fR(3)\fR), are "SSLv2", "SSLv3" and "TLSv1". .PP +Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. +.PP With Postfix >= 2.5 the parameter syntax is expanded to support protocol exclusions. One can now explicitly exclude SSLv2 by setting "smtp_tls_mandatory_protocols = !SSLv2". To exclude both SSLv2 and SSLv3 set "smtp_tls_mandatory_protocols = !SSLv2, !SSLv3". Listing -the protocols to include, rather than protocols to exclude, is still -supported; use the form you find more intuitive. +the protocols to include, rather than protocols to exclude, is +supported, but not recommended. The exclusion form more closely +matches the behaviour when the OpenSSL library is newer than Postfix. .PP Since SSL version 2 has known protocol weaknesses and is now deprecated, the default setting excludes "SSLv2". This means that by @@ -6387,9 +6393,10 @@ .nf .na .ft C -smtp_tls_mandatory_protocols = TLSv1 -# Alternative form with Postfix >= 2.5: +# Preferred form with Postfix >= 2.5: smtp_tls_mandatory_protocols = !SSLv2, !SSLv3 +# Alternative form. +smtp_tls_mandatory_protocols = TLSv1 .fi .ad .ft R @@ -6622,14 +6629,18 @@ protocol names, (see \fBfBSSL_get_version\fR(3)\fR), are "SSLv2", "SSLv3" and "TLSv1". .PP +Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. +.PP To include a protocol list its name, to exclude it, prefix the name with a "!" character. To exclude SSLv2 even for opportunistic TLS set "smtp_tls_protocols = !SSLv2". To exclude both "SSLv2" and "SSLv3" set "smtp_tls_protocols = !SSLv2, !SSLv3". Explicitly listing the protocols to -include, is supported, but not recommended. OpenSSL provides no mechanisms -for excluding protocols not known at compile-time. If Postfix is linked -against an OpenSSL library that supports additional protocol versions, -they cannot be excluded using either syntax. +include, rather than protocols to exclude, is supported, but not +recommended. The exclusion form more closely matches the behaviour +when the OpenSSL library is newer than Postfix. .PP Example: .nf @@ -9209,7 +9220,7 @@ (see there for syntax details). .PP This feature is available in Postfix 2.3 and later. -.SH smtpd_tls_mandatory_protocols (default: SSLv3, TLSv1) +.SH smtpd_tls_mandatory_protocols (default: !SSLv2) The SSL/TLS protocols accepted by the Postfix SMTP server with mandatory TLS encryption. If the list is empty, the server supports all available SSL/TLS protocol versions. A non-empty value is a list @@ -9217,12 +9228,18 @@ names separated by whitespace, commas or colons. The supported protocol names are "SSLv2", "SSLv3" and "TLSv1", and are not case sensitive. .PP +Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. +.PP With Postfix >= 2.5 the parameter syntax is expanded to support protocol exclusions. One can now explicitly exclude SSLv2 by setting "smtpd_tls_mandatory_protocols = !SSLv2". To exclude both SSLv2 and SSLv3 set "smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3". Listing -the protocols to include, rather than protocols to exclude, is still -supported, use the form you find more intuitive. +the protocols to include, rather than protocols to exclude, is +supported, but not recommended. The exclusion form more closely +matches the behaviour when the OpenSSL library is newer than Postfix. .PP Since SSL version 2 has known protocol weaknesses and is now deprecated, the default setting excludes "SSLv2". This means that @@ -9254,14 +9271,18 @@ "TLSv1". In smtp_tls_policy_maps table entries, "protocols" attribute values are separated by a colon. .PP +Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. +.PP To include a protocol list its name, to exclude it, prefix the name with a "!" character. To exclude SSLv2 even for opportunistic TLS set "smtpd_tls_protocols = !SSLv2". To exclude both "SSLv2" and "SSLv3" set "smtpd_tls_protocols = !SSLv2, !SSLv3". Explicitly listing the protocols to -include, is supported, but not recommended. OpenSSL provides no mechanisms -for excluding protocols not known at compile-time. If Postfix is linked -against an OpenSSL library that supports additional protocol versions, -they cannot be excluded using either syntax. +include, rather than protocols to exclude, is supported, but not +recommended. The exclusion form more closely matches the behaviour +when the OpenSSL library is newer than Postfix. .PP Example: .nf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/man/man8/smtp.8 new/postfix-2.8.10/man/man8/smtp.8 --- old/postfix-2.8.8/man/man8/smtp.8 2010-12-31 02:19:44.000000000 +0100 +++ new/postfix-2.8.10/man/man8/smtp.8 2012-04-24 21:30:18.000000000 +0200 @@ -378,7 +378,7 @@ Optional lookup tables with the Postfix SMTP client TLS security policy by next-hop destination; when a non-empty value is specified, this overrides the obsolete smtp_tls_per_site parameter. -.IP "\fBsmtp_tls_mandatory_protocols (SSLv3, TLSv1)\fR" +.IP "\fBsmtp_tls_mandatory_protocols (!SSLv2)\fR" List of SSL/TLS protocols that the Postfix SMTP client will use with mandatory TLS encryption. .IP "\fBsmtp_tls_scert_verifydepth (9)\fR" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/man/man8/smtpd.8 new/postfix-2.8.10/man/man8/smtpd.8 --- old/postfix-2.8.8/man/man8/smtpd.8 2011-11-05 20:18:46.000000000 +0100 +++ new/postfix-2.8.10/man/man8/smtpd.8 2012-04-24 21:30:18.000000000 +0200 @@ -389,7 +389,7 @@ .IP "\fBsmtpd_tls_mandatory_exclude_ciphers (empty)\fR" Additional list of ciphers or cipher types to exclude from the SMTP server cipher list at mandatory TLS security levels. -.IP "\fBsmtpd_tls_mandatory_protocols (SSLv3, TLSv1)\fR" +.IP "\fBsmtpd_tls_mandatory_protocols (!SSLv2)\fR" The SSL/TLS protocols accepted by the Postfix SMTP server with mandatory TLS encryption. .IP "\fBsmtpd_tls_received_header (no)\fR" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/proto/TLS_README.html new/postfix-2.8.10/proto/TLS_README.html --- old/postfix-2.8.8/proto/TLS_README.html 2010-12-31 02:19:44.000000000 +0100 +++ new/postfix-2.8.10/proto/TLS_README.html 2012-04-24 19:31:08.000000000 +0200 @@ -790,12 +790,18 @@ "export". </p> <p> With mandatory TLS encryption, the Postfix SMTP server will by -default only use SSLv3 or TLSv1. SSLv2 is only used when TLS encryption +default disable SSLv2. SSLv2 is used only when TLS encryption is optional. The mandatory TLS protocol list is specified via the smtpd_tls_mandatory_protocols configuration parameter. The corresponding smtpd_tls_protocols parameter (Postfix ≥ 2.6) controls the SSL/TLS protocols used with opportunistic TLS. </p> +<p> Note that the OpenSSL library only supports protocol exclusion +(not inclusion). For this reason, Postfix can exclude only protocols +that are known at the time the Postfix software is written. If new +protocols are added to the OpenSSL library, they cannot be excluded +without corresponding changes to the Postfix source code. </p> + <p> For a server that is not a public Internet MX host, Postfix (≥ 2.3) supports configurations with no <a href="#server_cert_key">server certificates</a> that use <b>only</b> the anonymous ciphers. This is @@ -813,9 +819,10 @@ smtpd_tls_mandatory_ciphers = high smtpd_tls_mandatory_exclude_ciphers = aNULL, MD5 smtpd_tls_security_level = encrypt - smtpd_tls_mandatory_protocols = TLSv1 - # Also available with Postfix ≥ 2.5: + # Preferred form with Postfix ≥ 2.5: smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3 + # Alternative form. + smtpd_tls_mandatory_protocols = TLSv1 </pre> </blockquote> @@ -859,8 +866,8 @@ <p> Postfix 2.8 and later, in combination with OpenSSL 0.9.7 and later allows TLS servers to preempt the TLS client's cipher preference list. -This is only possible with SSLv3, as in SSLv2 the client chooses the -cipher from a list supplied by the server. </p> +This is possible only with SSLv3 and later, as in SSLv2 the client +chooses the cipher from a list supplied by the server. </p> <p> By default, the OpenSSL server selects the client's most preferred cipher that the server supports. With SSLv3 and later, the server @@ -1455,9 +1462,9 @@ <p> Examples: </p> <p> In the example below, traffic to <i>example.com</i> and its sub-domains -via the corresponding MX hosts always uses TLS. The protocol version will be -"SSLv3" or "TLSv1" (the default setting of smtp_tls_mandatory_protocols -excludes "SSLv2"). Only high or medium strength (i.e. 128 bit or +via the corresponding MX hosts always uses TLS. The SSLv2 protocol +will be disabled (the default setting of smtp_tls_mandatory_protocols +excludes "SSLv2"). Only high- or medium-strength (i.e. 128 bit or better) ciphers will be used by default for all "encrypt" security level sessions. </p> @@ -2306,7 +2313,7 @@ "export". </p> <p> With mandatory TLS encryption, the Postfix SMTP client will by -default only use SSLv3 or TLSv1. SSLv2 is only used when TLS encryption +default disable SSLv2. SSLv2 is used only when TLS encryption is optional. The mandatory TLS protocol list is specified via the smtp_tls_mandatory_protocols configuration parameter. The corresponding smtp_tls_protocols parameter (Postfix ≥ 2.6) controls @@ -2320,9 +2327,10 @@ smtp_tls_mandatory_ciphers = medium smtp_tls_mandatory_exclude_ciphers = RC4, MD5 smtp_tls_exclude_ciphers = aNULL - smtp_tls_mandatory_protocols = SSLv3, TLSv1 - # Also available with Postfix ≥ 2.5: + # Preferred form with Postfix ≥ 2.5: smtp_tls_mandatory_protocols = !SSLv2 + # Alternative form. + smtp_tls_mandatory_protocols = SSLv3, TLSv1 # Also available with Postfix ≥ 2.6: smtp_tls_ciphers = export smtp_tls_protocols = !SSLv2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/proto/postconf.proto new/postfix-2.8.10/proto/postconf.proto --- old/postfix-2.8.8/proto/postconf.proto 2011-06-19 16:22:13.000000000 +0200 +++ new/postfix-2.8.10/proto/postconf.proto 2012-04-24 19:25:28.000000000 +0200 @@ -10378,7 +10378,7 @@ <p> This feature is available in Postfix 2.3 and later. </p> -%PARAM smtp_tls_mandatory_protocols SSLv3, TLSv1 +%PARAM smtp_tls_mandatory_protocols !SSLv2 <p> List of SSL/TLS protocols that the Postfix SMTP client will use with mandatory TLS encryption. In main.cf the values are separated by @@ -10387,12 +10387,19 @@ empty value means allow all protocols. The valid protocol names, (see <b>SSL_get_version(3)</b>), are "SSLv2", "SSLv3" and "TLSv1". </p> +<p> Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. </p> + <p> With Postfix ≥ 2.5 the parameter syntax is expanded to support protocol exclusions. One can now explicitly exclude SSLv2 by setting "smtp_tls_mandatory_protocols = !SSLv2". To exclude both SSLv2 and SSLv3 set "smtp_tls_mandatory_protocols = !SSLv2, !SSLv3". Listing -the protocols to include, rather than protocols to exclude, is still -supported; use the form you find more intuitive. </p> +the protocols to include, rather than protocols to exclude, is +supported, but not recommended. The exclusion form more closely +matches the behaviour when the OpenSSL library is newer than Postfix. +</p> <p> Since SSL version 2 has known protocol weaknesses and is now deprecated, the default setting excludes "SSLv2". This means that by @@ -10405,9 +10412,10 @@ <p> Example: </p> <pre> -smtp_tls_mandatory_protocols = TLSv1 -# Alternative form with Postfix ≥ 2.5: +# Preferred form with Postfix ≥ 2.5: smtp_tls_mandatory_protocols = !SSLv2, !SSLv3 +# Alternative form. +smtp_tls_mandatory_protocols = TLSv1 </pre> <p> This feature is available in Postfix 2.3 and later. </p> @@ -10535,7 +10543,7 @@ <p> This feature is available in Postfix 2.3 and later. </p> -%PARAM lmtp_tls_mandatory_protocols SSLv3, TLSv1 +%PARAM lmtp_tls_mandatory_protocols !SSLv2 <p> The LMTP-specific version of the smtp_tls_mandatory_protocols configuration parameter. See there for details. </p> @@ -10556,7 +10564,7 @@ <p> This feature is available in Postfix 2.3 and later. </p> -%PARAM smtpd_tls_mandatory_protocols SSLv3, TLSv1 +%PARAM smtpd_tls_mandatory_protocols !SSLv2 <p> The SSL/TLS protocols accepted by the Postfix SMTP server with mandatory TLS encryption. If the list is empty, the server supports all @@ -10565,12 +10573,19 @@ names separated by whitespace, commas or colons. The supported protocol names are "SSLv2", "SSLv3" and "TLSv1", and are not case sensitive. </p> +<p> Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. </p> + <p> With Postfix ≥ 2.5 the parameter syntax is expanded to support protocol exclusions. One can now explicitly exclude SSLv2 by setting "smtpd_tls_mandatory_protocols = !SSLv2". To exclude both SSLv2 and SSLv3 set "smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3". Listing -the protocols to include, rather than protocols to exclude, is still -supported, use the form you find more intuitive. </p> +the protocols to include, rather than protocols to exclude, is +supported, but not recommended. The exclusion form more closely +matches the behaviour when the OpenSSL library is newer than Postfix. +</p> <p> Since SSL version 2 has known protocol weaknesses and is now deprecated, the default setting excludes "SSLv2". This means that @@ -11579,14 +11594,18 @@ protocol names, (see <b>SSL_get_version(3)</b>), are "SSLv2", "SSLv3" and "TLSv1". </p> +<p> Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. </p> + <p> To include a protocol list its name, to exclude it, prefix the name with a "!" character. To exclude SSLv2 even for opportunistic TLS set "smtp_tls_protocols = !SSLv2". To exclude both "SSLv2" and "SSLv3" set "smtp_tls_protocols = !SSLv2, !SSLv3". Explicitly listing the protocols to -include, is supported, but not recommended. OpenSSL provides no mechanisms -for excluding protocols not known at compile-time. If Postfix is linked -against an OpenSSL library that supports additional protocol versions, -they cannot be excluded using either syntax. </p> +include, rather than protocols to exclude, is supported, but not +recommended. The exclusion form more closely matches the behaviour +when the OpenSSL library is newer than Postfix. </p> <p> Example: </p> <pre> @@ -11609,14 +11628,18 @@ "TLSv1". In smtp_tls_policy_maps table entries, "protocols" attribute values are separated by a colon. </p> +<p> Note: As of OpenSSL 1.0.1 two new protocols are defined, "TLSv1.1" +and "TLSv1.2". If an older Postfix version is linked against OpenSSL +1.0.1 or later, these, or any other new protocol versions, are +unconditionally enabled. </p> + <p> To include a protocol list its name, to exclude it, prefix the name with a "!" character. To exclude SSLv2 even for opportunistic TLS set "smtpd_tls_protocols = !SSLv2". To exclude both "SSLv2" and "SSLv3" set "smtpd_tls_protocols = !SSLv2, !SSLv3". Explicitly listing the protocols to -include, is supported, but not recommended. OpenSSL provides no mechanisms -for excluding protocols not known at compile-time. If Postfix is linked -against an OpenSSL library that supports additional protocol versions, -they cannot be excluded using either syntax. </p> +include, rather than protocols to exclude, is supported, but not +recommended. The exclusion form more closely matches the behaviour +when the OpenSSL library is newer than Postfix. </p> <p> Example: </p> <pre> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/cleanup/cleanup_milter.c new/postfix-2.8.10/src/cleanup/cleanup_milter.c --- old/postfix-2.8.8/src/cleanup/cleanup_milter.c 2011-04-28 16:15:54.000000000 +0200 +++ new/postfix-2.8.10/src/cleanup/cleanup_milter.c 2012-02-02 16:09:47.000000000 +0100 @@ -840,8 +840,7 @@ /* Reset the saved PTR record and update last_type. */ ; else if ((header_label == 0 || (strncasecmp(header_label, STR(buf), len) == 0 - && (IS_SPACE_TAB(STR(buf)[len]) - || STR(buf)[len] == ':'))) + && (strlen(header_label) == len))) && --index == 0) { /* If we have a saved PTR record, it points to start of header. */ break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/global/mail_params.h new/postfix-2.8.10/src/global/mail_params.h --- old/postfix-2.8.8/src/global/mail_params.h 2011-03-14 18:59:09.000000000 +0100 +++ new/postfix-2.8.10/src/global/mail_params.h 2012-04-24 19:25:28.000000000 +0200 @@ -1249,7 +1249,7 @@ extern char *var_smtpd_tls_proto; #define VAR_SMTPD_TLS_MAND_PROTO "smtpd_tls_mandatory_protocols" -#define DEF_SMTPD_TLS_MAND_PROTO "SSLv3, TLSv1" +#define DEF_SMTPD_TLS_MAND_PROTO "!SSLv2" extern char *var_smtpd_tls_mand_proto; #define VAR_SMTPD_TLS_CIPH "smtpd_tls_ciphers" @@ -1462,9 +1462,9 @@ extern char *var_smtp_tls_proto; #define VAR_SMTP_TLS_MAND_PROTO "smtp_tls_mandatory_protocols" -#define DEF_SMTP_TLS_MAND_PROTO "SSLv3, TLSv1" +#define DEF_SMTP_TLS_MAND_PROTO "!SSLv2" #define VAR_LMTP_TLS_MAND_PROTO "lmtp_tls_mandatory_protocols" -#define DEF_LMTP_TLS_MAND_PROTO "SSLv3, TLSv1" +#define DEF_LMTP_TLS_MAND_PROTO "!SSLv2" extern char *var_smtp_tls_mand_proto; #define VAR_SMTP_TLS_VFY_CMATCH "smtp_tls_verify_cert_match" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/global/mail_version.h new/postfix-2.8.10/src/global/mail_version.h --- old/postfix-2.8.8/src/global/mail_version.h 2012-02-01 20:18:16.000000000 +0100 +++ new/postfix-2.8.10/src/global/mail_version.h 2012-04-24 19:27:06.000000000 +0200 @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20120201" -#define MAIL_VERSION_NUMBER "2.8.8" +#define MAIL_RELEASE_DATE "20120424" +#define MAIL_VERSION_NUMBER "2.8.10" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/local/Makefile.in new/postfix-2.8.10/src/local/Makefile.in --- old/postfix-2.8.8/src/local/Makefile.in 2011-04-26 22:28:59.000000000 +0200 +++ new/postfix-2.8.10/src/local/Makefile.in 2012-03-02 15:41:41.000000000 +0100 @@ -590,6 +590,7 @@ unknown.o: ../../include/attr.h unknown.o: ../../include/been_here.h unknown.o: ../../include/bounce.h +unknown.o: ../../include/defer.h unknown.o: ../../include/deliver_pass.h unknown.o: ../../include/deliver_request.h unknown.o: ../../include/delivered_hdr.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/local/unknown.c new/postfix-2.8.10/src/local/unknown.c --- old/postfix-2.8.8/src/local/unknown.c 2011-12-25 21:16:15.000000000 +0100 +++ new/postfix-2.8.10/src/local/unknown.c 2012-02-17 14:30:36.000000000 +0100 @@ -72,6 +72,7 @@ #include <mail_addr.h> #include <sent.h> #include <deliver_pass.h> +#include <defer.h> /* Application-specific. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/postlog/postlog.c new/postfix-2.8.10/src/postlog/postlog.c --- old/postfix-2.8.8/src/postlog/postlog.c 2009-04-17 22:04:00.000000000 +0200 +++ new/postfix-2.8.10/src/postlog/postlog.c 2012-02-14 15:14:56.000000000 +0100 @@ -206,7 +206,6 @@ if (isatty(STDERR_FILENO)) msg_vstream_init(tag, VSTREAM_ERR); msg_syslog_init(tag, LOG_PID, LOG_FACILITY); - tag = 0; /* * Parse switches. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/smtp/smtp.c new/postfix-2.8.10/src/smtp/smtp.c --- old/postfix-2.8.8/src/smtp/smtp.c 2010-12-31 02:19:44.000000000 +0100 +++ new/postfix-2.8.10/src/smtp/smtp.c 2012-04-24 21:30:18.000000000 +0200 @@ -348,7 +348,7 @@ /* Optional lookup tables with the Postfix SMTP client TLS security /* policy by next-hop destination; when a non-empty value is specified, /* this overrides the obsolete smtp_tls_per_site parameter. -/* .IP "\fBsmtp_tls_mandatory_protocols (SSLv3, TLSv1)\fR" +/* .IP "\fBsmtp_tls_mandatory_protocols (!SSLv2)\fR" /* List of SSL/TLS protocols that the Postfix SMTP client will use with /* mandatory TLS encryption. /* .IP "\fBsmtp_tls_scert_verifydepth (9)\fR" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/smtpd/smtpd.c new/postfix-2.8.10/src/smtpd/smtpd.c --- old/postfix-2.8.8/src/smtpd/smtpd.c 2011-10-20 23:28:55.000000000 +0200 +++ new/postfix-2.8.10/src/smtpd/smtpd.c 2012-04-24 21:30:18.000000000 +0200 @@ -357,7 +357,7 @@ /* .IP "\fBsmtpd_tls_mandatory_exclude_ciphers (empty)\fR" /* Additional list of ciphers or cipher types to exclude from the /* SMTP server cipher list at mandatory TLS security levels. -/* .IP "\fBsmtpd_tls_mandatory_protocols (SSLv3, TLSv1)\fR" +/* .IP "\fBsmtpd_tls_mandatory_protocols (!SSLv2)\fR" /* The SSL/TLS protocols accepted by the Postfix SMTP server with /* mandatory TLS encryption. /* .IP "\fBsmtpd_tls_received_header (no)\fR" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/tls/tls.h new/postfix-2.8.10/src/tls/tls.h --- old/postfix-2.8.8/src/tls/tls.h 2011-02-07 16:25:04.000000000 +0100 +++ new/postfix-2.8.10/src/tls/tls.h 2012-04-24 19:25:28.000000000 +0200 @@ -155,8 +155,19 @@ #define TLS_PROTOCOL_SSLv2 (1<<0) /* SSLv2 */ #define TLS_PROTOCOL_SSLv3 (1<<1) /* SSLv3 */ #define TLS_PROTOCOL_TLSv1 (1<<2) /* TLSv1 */ +#ifdef SSL_TXT_TLSV1_1 +#define TLS_PROTOCOL_TLSv1_1 (1<<3) /* TLSv1_1 */ +#else +#define TLS_PROTOCOL_TLSv1_1 0 /* Unknown */ +#endif +#ifdef SSL_TXT_TLSV1_2 +#define TLS_PROTOCOL_TLSv1_2 (1<<4) /* TLSv1_2 */ +#else +#define TLS_PROTOCOL_TLSv1_2 0 /* Unknown */ +#endif #define TLS_KNOWN_PROTOCOLS \ - ( TLS_PROTOCOL_SSLv2 | TLS_PROTOCOL_SSLv3 | TLS_PROTOCOL_TLSv1 ) + ( TLS_PROTOCOL_SSLv2 | TLS_PROTOCOL_SSLv3 | TLS_PROTOCOL_TLSv1 \ + | TLS_PROTOCOL_TLSv1_1 | TLS_PROTOCOL_TLSv1_2 ) extern int tls_protocol_mask(const char *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/tls/tls_client.c new/postfix-2.8.10/src/tls/tls_client.c --- old/postfix-2.8.8/src/tls/tls_client.c 2010-12-31 00:02:03.000000000 +0100 +++ new/postfix-2.8.10/src/tls/tls_client.c 2012-04-24 19:25:28.000000000 +0200 @@ -815,6 +815,12 @@ if (protomask != 0) SSL_set_options(TLScontext->con, ((protomask & TLS_PROTOCOL_TLSv1) ? SSL_OP_NO_TLSv1 : 0L) +#ifdef SSL_OP_NO_TLSv1_1 + | ((protomask & TLS_PROTOCOL_TLSv1_1) ? SSL_OP_NO_TLSv1_1 : 0L) +#endif +#ifdef SSL_OP_NO_TLSv1_2 + | ((protomask & TLS_PROTOCOL_TLSv1_2) ? SSL_OP_NO_TLSv1_2 : 0L) +#endif | ((protomask & TLS_PROTOCOL_SSLv3) ? SSL_OP_NO_SSLv3 : 0L) | ((protomask & TLS_PROTOCOL_SSLv2) ? SSL_OP_NO_SSLv2 : 0L)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/tls/tls_misc.c new/postfix-2.8.10/src/tls/tls_misc.c --- old/postfix-2.8.8/src/tls/tls_misc.c 2011-01-18 22:46:39.000000000 +0100 +++ new/postfix-2.8.10/src/tls/tls_misc.c 2012-04-24 19:25:28.000000000 +0200 @@ -215,6 +215,12 @@ SSL_TXT_SSLV2, TLS_PROTOCOL_SSLv2, SSL_TXT_SSLV3, TLS_PROTOCOL_SSLv3, SSL_TXT_TLSV1, TLS_PROTOCOL_TLSv1, +#ifdef SSL_TXT_TLSV1_1 + SSL_TXT_TLSV1_1, TLS_PROTOCOL_TLSv1_1, +#endif +#ifdef SSL_TXT_TLSV1_2 + SSL_TXT_TLSV1_2, TLS_PROTOCOL_TLSv1_2, +#endif 0, TLS_PROTOCOL_INVALID, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/tls/tls_server.c new/postfix-2.8.10/src/tls/tls_server.c --- old/postfix-2.8.8/src/tls/tls_server.c 2011-02-07 16:38:33.000000000 +0100 +++ new/postfix-2.8.10/src/tls/tls_server.c 2012-04-24 19:25:28.000000000 +0200 @@ -397,6 +397,12 @@ if (protomask != 0) SSL_CTX_set_options(server_ctx, ((protomask & TLS_PROTOCOL_TLSv1) ? SSL_OP_NO_TLSv1 : 0L) +#ifdef SSL_OP_NO_TLSv1_1 + | ((protomask & TLS_PROTOCOL_TLSv1_1) ? SSL_OP_NO_TLSv1_1 : 0L) +#endif +#ifdef SSL_OP_NO_TLSv1_2 + | ((protomask & TLS_PROTOCOL_TLSv1_2) ? SSL_OP_NO_TLSv1_2 : 0L) +#endif | ((protomask & TLS_PROTOCOL_SSLv3) ? SSL_OP_NO_SSLv3 : 0L) | ((protomask & TLS_PROTOCOL_SSLv2) ? SSL_OP_NO_SSLv2 : 0L)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/xsasl/xsasl_cyrus.h new/postfix-2.8.10/src/xsasl/xsasl_cyrus.h --- old/postfix-2.8.8/src/xsasl/xsasl_cyrus.h 2005-12-20 18:48:22.000000000 +0100 +++ new/postfix-2.8.10/src/xsasl/xsasl_cyrus.h 2012-04-01 16:28:36.000000000 +0200 @@ -26,6 +26,11 @@ extern XSASL_SERVER_IMPL *xsasl_cyrus_server_init(const char *, const char *); extern XSASL_CLIENT_IMPL *xsasl_cyrus_client_init(const char *, const char *); + /* + * Internal definitions for client and server module. + */ +typedef int (*XSASL_CYRUS_CB) (void); + #endif /* LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/xsasl/xsasl_cyrus_client.c new/postfix-2.8.10/src/xsasl/xsasl_cyrus_client.c --- old/postfix-2.8.8/src/xsasl/xsasl_cyrus_client.c 2009-04-19 01:39:30.000000000 +0200 +++ new/postfix-2.8.10/src/xsasl/xsasl_cyrus_client.c 2012-04-01 16:28:36.000000000 +0200 @@ -223,7 +223,7 @@ * Global callbacks. These have no per-session context. */ static sasl_callback_t callbacks[] = { - {SASL_CB_LOG, &xsasl_cyrus_log, 0}, + {SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, 0}, {SASL_CB_LIST_END, 0, 0} }; @@ -302,9 +302,9 @@ { XSASL_CYRUS_CLIENT *client = 0; static sasl_callback_t callbacks[] = { - {SASL_CB_USER, &xsasl_cyrus_client_get_user, 0}, - {SASL_CB_AUTHNAME, &xsasl_cyrus_client_get_user, 0}, - {SASL_CB_PASS, &xsasl_cyrus_client_get_passwd, 0}, + {SASL_CB_USER, (XSASL_CYRUS_CB) &xsasl_cyrus_client_get_user, 0}, + {SASL_CB_AUTHNAME, (XSASL_CYRUS_CB) &xsasl_cyrus_client_get_user, 0}, + {SASL_CB_PASS, (XSASL_CYRUS_CB) &xsasl_cyrus_client_get_passwd, 0}, {SASL_CB_LIST_END, 0, 0} }; sasl_conn_t *sasl_conn = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.8.8/src/xsasl/xsasl_cyrus_server.c new/postfix-2.8.10/src/xsasl/xsasl_cyrus_server.c --- old/postfix-2.8.8/src/xsasl/xsasl_cyrus_server.c 2009-04-19 00:43:58.000000000 +0200 +++ new/postfix-2.8.10/src/xsasl/xsasl_cyrus_server.c 2012-04-01 16:28:36.000000000 +0200 @@ -170,7 +170,7 @@ #define NO_CALLBACK_CONTEXT 0 static sasl_callback_t callbacks[] = { - {SASL_CB_LOG, &xsasl_cyrus_log, NO_CALLBACK_CONTEXT}, + {SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, NO_CALLBACK_CONTEXT}, {SASL_CB_LIST_END, 0, 0} }; ++++++ postfix-vda-v10-2.8.5.patch -> postfix-vda-v10-2.8.9.patch ++++++ --- /work/SRC/openSUSE:Factory/postfix/postfix-vda-v10-2.8.5.patch 2012-03-01 17:26:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix-vda-v10-2.8.9.patch 2012-05-08 12:28:56.000000000 +0200 @@ -1,6 +1,6 @@ -diff -uNr postfix-2.8.5.orig/README_FILES/VDA_README postfix-2.8.5/README_FILES/VDA_README ---- postfix-2.8.5.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 -+++ postfix-2.8.5/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100 +diff -uNr postfix-2.8.9.orig/README_FILES/VDA_README postfix-2.8.9/README_FILES/VDA_README +--- postfix-2.8.9.orig/README_FILES/VDA_README 1970-01-01 01:00:00.000000000 +0100 ++++ postfix-2.8.9/README_FILES/VDA_README 2011-03-03 08:26:48.000000000 +0100 @@ -0,0 +1,10 @@ +Postfix VDA patch for maildir++ quota support by + Anderson Nadal <andernadal@gmail.com> @@ -12,9 +12,9 @@ +provided by this patch. + + -diff -uNr postfix-2.8.5.orig/src/global/mail_params.h postfix-2.8.5/src/global/mail_params.h ---- postfix-2.8.5.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100 -+++ postfix-2.8.5/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.9.orig/src/global/mail_params.h postfix-2.8.9/src/global/mail_params.h +--- postfix-2.8.9.orig/src/global/mail_params.h 2011-01-17 15:56:39.000000000 +0100 ++++ postfix-2.8.9/src/global/mail_params.h 2011-03-03 07:40:55.000000000 +0100 @@ -2333,6 +2333,54 @@ #define DEF_VIRT_GID_MAPS "" extern char *var_virt_gid_maps; @@ -70,9 +70,9 @@ #define VAR_VIRT_MINUID "virtual_minimum_uid" #define DEF_VIRT_MINUID 100 extern int var_virt_minimum_uid; -diff -uNr postfix-2.8.5.orig/src/util/file_limit.c postfix-2.8.5/src/util/file_limit.c ---- postfix-2.8.5.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 -+++ postfix-2.8.5/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.9.orig/src/util/file_limit.c postfix-2.8.9/src/util/file_limit.c +--- postfix-2.8.9.orig/src/util/file_limit.c 2003-10-22 20:48:36.000000000 +0200 ++++ postfix-2.8.9/src/util/file_limit.c 2011-03-03 07:40:55.000000000 +0100 @@ -85,7 +85,11 @@ #else struct rlimit rlim; @@ -86,9 +86,9 @@ if (setrlimit(RLIMIT_FSIZE, &rlim) < 0) msg_fatal("setrlimit: %m"); #ifdef SIGXFSZ -diff -uNr postfix-2.8.5.orig/src/virtual/mailbox.c postfix-2.8.5/src/virtual/mailbox.c ---- postfix-2.8.5.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200 -+++ postfix-2.8.5/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.9.orig/src/virtual/mailbox.c postfix-2.8.9/src/virtual/mailbox.c +--- postfix-2.8.9.orig/src/virtual/mailbox.c 2008-07-26 03:22:37.000000000 +0200 ++++ postfix-2.8.9/src/virtual/mailbox.c 2011-03-03 07:40:55.000000000 +0100 @@ -70,6 +70,70 @@ #define YES 1 #define NO 0 @@ -268,9 +268,9 @@ /* * Cleanup. -diff -uNr postfix-2.8.5.orig/src/virtual/maildir.c postfix-2.8.5/src/virtual/maildir.c ---- postfix-2.8.5.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200 -+++ postfix-2.8.5/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100 +diff -uNr postfix-2.8.9.orig/src/virtual/maildir.c postfix-2.8.9/src/virtual/maildir.c +--- postfix-2.8.9.orig/src/virtual/maildir.c 2006-06-26 14:59:19.000000000 +0200 ++++ postfix-2.8.9/src/virtual/maildir.c 2011-03-03 08:15:42.000000000 +0100 @@ -63,28 +63,420 @@ #include <mbox_open.h> #include <dsn_util.h> @@ -1256,9 +1256,9 @@ + return (deliver_status); } -diff -uNr postfix-2.8.5.orig/src/virtual/virtual.c postfix-2.8.5/src/virtual/virtual.c ---- postfix-2.8.5.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100 -+++ postfix-2.8.5/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.9.orig/src/virtual/virtual.c postfix-2.8.9/src/virtual/virtual.c +--- postfix-2.8.9.orig/src/virtual/virtual.c 2010-01-02 02:57:04.000000000 +0100 ++++ postfix-2.8.9/src/virtual/virtual.c 2011-03-03 07:40:55.000000000 +0100 @@ -335,12 +335,30 @@ char *var_mail_spool_dir; /* XXX dependency fix */ bool var_strict_mbox_owner; @@ -1388,9 +1388,9 @@ MAIL_SERVER_PRIVILEGED, 0); } -diff -uNr postfix-2.8.5.orig/src/virtual/virtual.h postfix-2.8.5/src/virtual/virtual.h ---- postfix-2.8.5.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 -+++ postfix-2.8.5/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100 +diff -uNr postfix-2.8.9.orig/src/virtual/virtual.h postfix-2.8.9/src/virtual/virtual.h +--- postfix-2.8.9.orig/src/virtual/virtual.h 2006-01-08 00:59:47.000000000 +0100 ++++ postfix-2.8.9/src/virtual/virtual.h 2011-03-03 07:40:55.000000000 +0100 @@ -34,6 +34,9 @@ extern MAPS *virtual_mailbox_maps; extern MAPS *virtual_uid_maps; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org