Prereq: "2.10.7"
diff -cr --new-file /var/tmp/postfix-2.10.7/src/global/mail_version.h ./src/global/mail_version.h
*** /var/tmp/postfix-2.10.7/src/global/mail_version.h	2015-04-12 17:34:37.000000000 -0400
--- ./src/global/mail_version.h	2015-07-20 19:18:59.000000000 -0400
***************
*** 20,27 ****
    * Patches change both the patchlevel and the release date. Snapshots have no
    * patchlevel; they change the release date only.
    */
! #define MAIL_RELEASE_DATE	"20150412"
! #define MAIL_VERSION_NUMBER	"2.10.7"
  
  #ifdef SNAPSHOT
  # define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
--- 20,27 ----
    * Patches change both the patchlevel and the release date. Snapshots have no
    * patchlevel; they change the release date only.
    */
! #define MAIL_RELEASE_DATE	"20150720"
! #define MAIL_VERSION_NUMBER	"2.10.8"
  
  #ifdef SNAPSHOT
  # define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
diff -cr --new-file /var/tmp/postfix-2.10.7/HISTORY ./HISTORY
*** /var/tmp/postfix-2.10.7/HISTORY	2015-04-12 18:40:37.000000000 -0400
--- ./HISTORY	2015-07-19 19:20:38.000000000 -0400
***************
*** 18420,18422 ****
--- 18420,18442 ----
  
  	Incompatibility: specifying "make makefiles" with "CC=command"
  	will no longer override the default WARN setting.
+ 
+ 20150501
+ 
+ 	Support for Linux 4.*, and some simplification for future
+ 	makedefs files. Files: makedefs, util/sys_defs.h.
+ 
+ 20150718
+ 
+ 	Security: opportunistic TLS by default uses "medium" or
+ 	stronger ciphers instead of "export" or stronger. See the
+ 	RELEASE_NOTES file for how to get the old settings back.
+ 	Files: global/mail_params.h, proto/TLS_README.html,
+ 	proto/postconf.proto, and files derived from those.
+ 
+ 20150719
+ 
+ 	Security: Postfix TLS support by default no longer uses
+ 	SSLv2 or SSLv3.  See the RELEASE_NOTES file for how to get
+ 	the old settings back. Files: global/mail_params.h,
+ 	proto/postconf.proto, and files derived from those.
diff -cr --new-file /var/tmp/postfix-2.10.7/README_FILES/TLS_README ./README_FILES/TLS_README
*** /var/tmp/postfix-2.10.7/README_FILES/TLS_README	2013-02-03 13:18:08.000000000 -0500
--- ./README_FILES/TLS_README	2015-07-20 19:11:33.803653000 -0400
***************
*** 503,515 ****
  
  SSeerrvveerr--ssiiddee cciipphheerr ccoonnttrroollss
  
! The Postfix SMTP server supports 5 distinct cipher security levels as specified
! by the smtpd_tls_mandatory_ciphers configuration parameter, which determines
! the cipher grade with mandatory TLS encryption. The default value is "medium"
! which is essentially 128-bit encryption or better. With opportunistic TLS
! encryption, the minimum accepted cipher grade is typically "export". The
! corresponding smtpd_tls_ciphers parameter (Postfix >= 2.6) controls the cipher
! grade used with opportunistic TLS.
  
  By default anonymous ciphers are enabled. They are automatically disabled when
  remote SMTP client certificates are requested. If clients are expected to
--- 503,517 ----
  
  SSeerrvveerr--ssiiddee cciipphheerr ccoonnttrroollss
  
! The Postfix SMTP server supports 5 distinct cipher grades as specified by the
! smtpd_tls_mandatory_ciphers configuration parameter, which determines the
! minimum cipher grade with mandatory TLS encryption. The default minimum cipher
! grade for mandatory TLS is "medium" which is essentially 128-bit encryption or
! better. The smtpd_tls_ciphers parameter (Postfix >= 2.6) controls the minimum
! cipher grade used with opportunistic TLS. Here, the default minimum cipher
! grade is "medium" for Postfix releases after the middle of 2015, "export" for
! older Postfix releases. With Postfix < 2.6, the minimum opportunistic TLS
! cipher grade is always "export".
  
  By default anonymous ciphers are enabled. They are automatically disabled when
  remote SMTP client certificates are requested. If clients are expected to
***************
*** 519,533 ****
  SMTP client to check the server certificate, so excluding anonymous ciphers is
  generally unnecessary.
  
! The "smtpd_tls_ciphers" configuration parameter (Postfix >= 2.6) provides
! 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 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
--- 521,532 ----
  SMTP client to check the server certificate, so excluding anonymous ciphers is
  generally unnecessary.
  
! With mandatory and opportunistic TLS encryption, the Postfix SMTP server by
! default disables SSLv2 and SSLv3 with Postfix releases after the middle of
! 2015; older releases only disable SSLv2 for mandatory TLS. The mandatory TLS
  protocol list is specified via the smtpd_tls_mandatory_protocols configuration
! parameter. The 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
***************
*** 700,712 ****
  configured by setting "smtp_tls_security_level = may". For LMTP, use the
  corresponding "lmtp_" parameter.
  
! Since sending in the clear is acceptable, demanding stronger than default TLS
! security mostly reduces inter-operability. If you must restrict TLS protocol or
! cipher selection even with opportunistic TLS, the "smtp_tls_ciphers" and
! "smtp_tls_protocols" configuration parameters (Postfix >= 2.6) provide control
! over the protocols and cipher grade used with opportunistic TLS. With earlier
! releases the opportunistic TLS cipher grade is always "export" and no protocols
! are disabled.
  
  With opportunistic TLS, mail delivery continues even if the server certificate
  is untrusted or bears the wrong name. When the TLS handshake fails for an
--- 699,708 ----
  configured by setting "smtp_tls_security_level = may". For LMTP, use the
  corresponding "lmtp_" parameter.
  
! The "smtp_tls_ciphers" and "smtp_tls_protocols" configuration parameters
! (Postfix >= 2.6) provide control over the cipher grade and protocols used with
! opportunistic TLS. With earlier Postfix releases, opportunistic TLS always uses
! the cipher grade "export" and enables all protocols.
  
  With opportunistic TLS, mail delivery continues even if the server certificate
  is untrusted or bears the wrong name. When the TLS handshake fails for an
***************
*** 767,773 ****
  
  In the example below, traffic to example.com and its sub-domains 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.
  
--- 763,769 ----
  
  In the example below, traffic to example.com and its sub-domains via the
  corresponding MX hosts always uses TLS. The SSLv2 protocol will be disabled
! (the default setting of smtp_tls_mandatory_protocols excludes SSLv2+3). Only
  high- or medium-strength (i.e. 128 bit or better) ciphers will be used by
  default for all "encrypt" security level sessions.
  
***************
*** 1462,1474 ****
  
  CClliieenntt--ssiiddee cciipphheerr ccoonnttrroollss
  
! The Postfix SMTP client supports 5 distinct cipher security levels as specified
! by the smtp_tls_mandatory_ciphers configuration parameter. This setting
! controls the minimum acceptable SMTP client TLS cipher grade for use with
! mandatory TLS encryption. The default value "medium" is suitable for most
! destinations with which you may want to enforce TLS, and is beyond the reach of
! today's cryptanalytic methods. See smtp_tls_policy_maps for information on how
! to configure ciphers on a per-destination basis.
  
  By default anonymous ciphers are allowed, and automatically disabled when
  remote SMTP server certificates are verified. If you want to disable anonymous
--- 1458,1470 ----
  
  CClliieenntt--ssiiddee cciipphheerr ccoonnttrroollss
  
! The Postfix SMTP client supports 5 distinct cipher grades as specified by the
! smtp_tls_mandatory_ciphers configuration parameter. This setting controls the
! minimum acceptable SMTP client TLS cipher grade for use with mandatory TLS
! encryption. The default value "medium" is suitable for most destinations with
! which you may want to enforce TLS, and is beyond the reach of today's
! cryptanalytic methods. See smtp_tls_policy_maps for information on how to
! configure ciphers on a per-destination basis.
  
  By default anonymous ciphers are allowed, and automatically disabled when
  remote SMTP server certificates are verified. If you want to disable anonymous
***************
*** 1480,1493 ****
  requesting them.
  
  The "smtp_tls_ciphers" configuration parameter (Postfix >= 2.6) provides
! 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 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:
  
--- 1476,1491 ----
  requesting them.
  
  The "smtp_tls_ciphers" configuration parameter (Postfix >= 2.6) provides
! control over the minimum cipher grade for opportunistic TLS. The default
! minimum cipher grade for opportunistic TLS is "medium" for Postfix releases
! after the middle of 2015, and "export" for older releases. With Postfix < 2.6,
! the minimum opportunistic TLS cipher grade is always "export".
! 
! With mandatory and opportunistic TLS encryption, the Postfix SMTP client will
! by default disable SSLv2 and SSLv3. 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:
  
***************
*** 1500,1506 ****
          # Alternative form.
          smtp_tls_mandatory_protocols = SSLv3, TLSv1
          # Also available with Postfix >= 2.6:
!         smtp_tls_ciphers = export
          smtp_tls_protocols = !SSLv2
  
  CClliieenntt--ssiiddee SSMMTTPPSS ssuuppppoorrtt
--- 1498,1504 ----
          # Alternative form.
          smtp_tls_mandatory_protocols = SSLv3, TLSv1
          # Also available with Postfix >= 2.6:
!         smtp_tls_ciphers = medium
          smtp_tls_protocols = !SSLv2
  
  CClliieenntt--ssiiddee SSMMTTPPSS ssuuppppoorrtt
diff -cr --new-file /var/tmp/postfix-2.10.7/RELEASE_NOTES ./RELEASE_NOTES
*** /var/tmp/postfix-2.10.7/RELEASE_NOTES	2013-09-05 08:47:15.000000000 -0400
--- ./RELEASE_NOTES	2015-07-19 19:21:51.000000000 -0400
***************
*** 14,19 ****
--- 14,53 ----
  If you upgrade from Postfix 2.8 or earlier, read RELEASE_NOTES-2.9
  before proceeding.
  
+ Incompatible change with Postfix 2.10.8
+ ---------------------------------------
+ 
+ As of the middle of 2015, all supported Postfix releases no longer
+ enable "export" grade ciphers for opportunistic TLS, and no longer
+ use the deprecated SSLv2 and SSLv3 protocols for mandatory or
+ opportunistic TLS.
+ 
+ These changes are very unlikely to cause problems with server-to-server
+ communication over the Internet, but they may result in interoperability
+ problems with ancient client or server implementations on internal
+ networks.  To address this problem, you can revert the changes with:
+ 
+ Postfix SMTP client settings:
+ 
+     lmtp_tls_ciphers = export
+     smtp_tls_ciphers = export
+     lmtp_tls_protocols = !SSLv2
+     smtp_tls_protocols = !SSLv2
+     lmtp_tls_mandatory_protocols = !SSLv2
+     smtp_tls_mandatory_protocols = !SSLv2
+ 
+ Postfix SMTP server settings:
+ 
+     smtpd_tls_ciphers = export
+     smtpd_tls_protocols =
+     smtpd_tls_mandatory_protocols = !SSLv2
+ 
+ These settings, if put in main.cf, affect all Postfix SMTP client
+ or server communication, which may be undesirable. To be more
+ selective, use "-o name=value" parameter overrides on specific
+ services in master.cf. Execute the command "postfix reload" to make
+ the changes effective.
+ 
  Debian Exim before 4.80-3 interoperability workaround
  -----------------------------------------------------
  
diff -cr --new-file /var/tmp/postfix-2.10.7/html/TLS_README.html ./html/TLS_README.html
*** /var/tmp/postfix-2.10.7/html/TLS_README.html	2013-02-03 13:18:06.000000000 -0500
--- ./html/TLS_README.html	2015-07-20 19:11:33.803653000 -0400
***************
*** 725,738 ****
  
  <h3><a name="server_cipher">Server-side cipher controls</a> </h3>
  
! <p> The Postfix SMTP server supports 5 distinct cipher security levels
! as specified by the <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a> configuration parameter,
! which determines the cipher grade with mandatory TLS encryption. The
! default value is "medium" which is essentially 128-bit encryption or better.
! With opportunistic TLS encryption, the minimum accepted cipher grade is
! typically "export". The corresponding <a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a> parameter
! (Postfix &ge; 2.6) controls the cipher grade used with opportunistic
! TLS. </p>
  
  <p> By default anonymous ciphers are enabled. They are automatically
  disabled when remote SMTP client certificates are requested. If
--- 725,740 ----
  
  <h3><a name="server_cipher">Server-side cipher controls</a> </h3>
  
! <p> The Postfix SMTP server supports 5 distinct cipher grades as
! specified by the <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a> configuration parameter,
! which determines the minimum cipher grade with mandatory TLS
! encryption.  The default minimum cipher grade for mandatory TLS is
! "medium" which is essentially 128-bit encryption or better.  The
! <a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a> parameter (Postfix &ge; 2.6) controls the minimum
! cipher grade used with opportunistic TLS.  Here, the default minimum
! cipher grade is "medium" for Postfix releases after the middle of
! 2015, "export" for older Postfix releases. With Postfix &lt; 2.6,
! the minimum opportunistic TLS cipher grade is always "export".  </p>
  
  <p> By default anonymous ciphers are enabled. They are automatically
  disabled when remote SMTP client certificates are requested. If
***************
*** 743,759 ****
  a remote SMTP client to check the server certificate, so excluding
  anonymous ciphers is generally unnecessary. </p>
  
! <p> The "<a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a>" configuration parameter (Postfix &ge;
! 2.6) provides control over the minimum cipher grade for opportunistic
! TLS. With
! Postfix &lt; 2.6, the minimum opportunistic TLS cipher grade is always
! "export". </p>
! 
! <p> 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
  <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 &ge; 2.6)
  controls the SSL/TLS protocols used with opportunistic TLS. </p>
  
  <p> Note that the OpenSSL library only supports protocol exclusion
--- 745,756 ----
  a remote SMTP client to check the server certificate, so excluding
  anonymous ciphers is generally unnecessary. </p>
  
! <p> With mandatory and opportunistic TLS encryption, the Postfix
! SMTP server by default disables SSLv2 and SSLv3 with Postfix releases
! after the middle of 2015; older releases only disable SSLv2 for
! mandatory TLS. 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
! <a href="postconf.5.html#smtpd_tls_protocols">smtpd_tls_protocols</a> parameter (Postfix &ge; 2.6)
  controls the SSL/TLS protocols used with opportunistic TLS. </p>
  
  <p> Note that the OpenSSL library only supports protocol exclusion
***************
*** 982,995 ****
  Opportunistic TLS can be configured by setting "<a href="postconf.5.html#smtp_tls_security_level">smtp_tls_security_level</a> = may".
  For LMTP, use the corresponding "lmtp_" parameter. </p>
  
! <p> Since sending in the clear is acceptable, demanding stronger
! than default TLS security mostly reduces inter-operability. If you
! must restrict TLS protocol or cipher selection even with opportunistic
! TLS, the "<a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a>" and "<a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a>" configuration
! parameters (Postfix &ge; 2.6) provide control over the protocols
! and cipher grade
! used with opportunistic TLS. With earlier releases the opportunistic TLS
! cipher grade is always "export" and no protocols are disabled. </p>
  
  <p> With opportunistic TLS, mail delivery continues even if the
  server certificate is untrusted or bears the wrong name.  
--- 979,989 ----
  Opportunistic TLS can be configured by setting "<a href="postconf.5.html#smtp_tls_security_level">smtp_tls_security_level</a> = may".
  For LMTP, use the corresponding "lmtp_" parameter. </p>
  
! <p> The "<a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a>" and "<a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a>" configuration
! parameters (Postfix &ge; 2.6) provide control over the cipher grade
! and protocols used with opportunistic TLS.  With earlier Postfix
! releases, opportunistic TLS always uses the cipher grade "export"
! and enables all protocols. </p>
  
  <p> With opportunistic TLS, mail delivery continues even if the
  server certificate is untrusted or bears the wrong name.  
***************
*** 1065,1071 ****
  <p> In the example below, traffic to <i>example.com</i> and its sub-domains
  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>
  
--- 1059,1065 ----
  <p> In the example below, traffic to <i>example.com</i> and its sub-domains
  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+3). Only high- or medium-strength (i.e. 128 bit or
  better) ciphers will be used by default for all "encrypt" security
  level sessions. </p>
  
***************
*** 1943,1949 ****
  
  <h3> <a name="client_cipher">Client-side cipher controls </a> </h3>
  
! <p> The Postfix SMTP client supports 5 distinct cipher security levels
  as specified by the <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> configuration
  parameter. This setting controls the minimum acceptable SMTP client
  TLS cipher grade for use with mandatory TLS encryption. The default
--- 1937,1943 ----
  
  <h3> <a name="client_cipher">Client-side cipher controls </a> </h3>
  
! <p> The Postfix SMTP client supports 5 distinct cipher grades
  as specified by the <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> configuration
  parameter. This setting controls the minimum acceptable SMTP client
  TLS cipher grade for use with mandatory TLS encryption. The default
***************
*** 1964,1976 ****
  little point in requesting them. </p>
  
  <p> The "<a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a>" configuration parameter (Postfix &ge; 2.6)
! provides control over the minimum cipher grade for opportunistic TLS. With
! Postfix &lt; 2.6, the minimum opportunistic TLS cipher grade is always
! "export". </p>
! 
! <p> 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
  <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 &ge; 2.6) controls
  the SSL/TLS protocols used with opportunistic TLS. </p>
--- 1958,1972 ----
  little point in requesting them. </p>
  
  <p> The "<a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a>" configuration parameter (Postfix &ge; 2.6)
! provides control over the minimum cipher grade for opportunistic TLS.
! The default minimum cipher grade for opportunistic TLS is "medium"
! for Postfix releases after the middle of 2015, and "export" for
! older releases.  With Postfix &lt; 2.6, the minimum opportunistic
! TLS cipher grade is always "export".  </p>
! 
! <p> With mandatory and opportunistic TLS encryption, the Postfix
! SMTP client will by default disable SSLv2 and SSLv3. 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 &ge; 2.6) controls
  the SSL/TLS protocols used with opportunistic TLS. </p>
***************
*** 1988,1994 ****
      # Alternative form.
      <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = SSLv3, TLSv1
      # Also available with Postfix &ge; 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
  </pre>
  </blockquote>
--- 1984,1990 ----
      # Alternative form.
      <a href="postconf.5.html#smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a> = SSLv3, TLSv1
      # Also available with Postfix &ge; 2.6:
!     <a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a> = medium
      <a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> = !SSLv2
  </pre>
  </blockquote>
diff -cr --new-file /var/tmp/postfix-2.10.7/html/lmtp.8.html ./html/lmtp.8.html
*** /var/tmp/postfix-2.10.7/html/lmtp.8.html	2012-07-17 15:40:55.000000000 -0400
--- ./html/lmtp.8.html	2015-07-19 19:33:50.000000000 -0400
***************
*** 478,484 ****
                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> (!SSLv2)</b>
                List of SSL/TLS protocols  that  the  Postfix  SMTP
                client will use with mandatory TLS encryption.
  
--- 478,484 ----
                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> (!SSLv2, !SSLv3)</b>
                List of SSL/TLS protocols  that  the  Postfix  SMTP
                client will use with mandatory TLS encryption.
  
***************
*** 551,562 ****
  
         Available in Postfix version 2.6 and later:
  
!        <b><a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> (!SSLv2)</b>
                List of TLS protocols that the Postfix SMTP  client
                will  exclude  or  include  with  opportunistic TLS
                encryption.
  
!        <b><a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a> (export)</b>
                The minimum TLS cipher grade that the Postfix  SMTP
                client  will use with opportunistic TLS encryption.
  
--- 551,562 ----
  
         Available in Postfix version 2.6 and later:
  
!        <b><a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> (!SSLv2, !SSLv3)</b>
                List of TLS protocols that the Postfix SMTP  client
                will  exclude  or  include  with  opportunistic TLS
                encryption.
  
!        <b><a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a> (medium)</b>
                The minimum TLS cipher grade that the Postfix  SMTP
                client  will use with opportunistic TLS encryption.
  
diff -cr --new-file /var/tmp/postfix-2.10.7/html/postconf.5.html ./html/postconf.5.html
*** /var/tmp/postfix-2.10.7/html/postconf.5.html	2013-06-13 10:06:06.000000000 -0400
--- ./html/postconf.5.html	2015-07-19 19:40:58.000000000 -0400
***************
*** 4683,4689 ****
  </DD>
  
  <DT><b><a name="lmtp_tls_ciphers">lmtp_tls_ciphers</a>
! (default: export)</b></DT><DD>
  
  <p> The LMTP-specific version of the <a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a> configuration
  parameter. See there for details. </p>
--- 4683,4689 ----
  </DD>
  
  <DT><b><a name="lmtp_tls_ciphers">lmtp_tls_ciphers</a>
! (default: medium)</b></DT><DD>
  
  <p> The LMTP-specific version of the <a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a> configuration
  parameter. See there for details. </p>
***************
*** 4806,4812 ****
  </DD>
  
  <DT><b><a name="lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>
! (default: empty)</b></DT><DD>
  
  <p> The LMTP-specific version of the <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a>
  configuration parameter.  See there for details. </p>
--- 4806,4812 ----
  </DD>
  
  <DT><b><a name="lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>
! (default: medium)</b></DT><DD>
  
  <p> The LMTP-specific version of the <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a>
  configuration parameter.  See there for details. </p>
***************
*** 4828,4834 ****
  </DD>
  
  <DT><b><a name="lmtp_tls_mandatory_protocols">lmtp_tls_mandatory_protocols</a>
! (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>
--- 4828,4834 ----
  </DD>
  
  <DT><b><a name="lmtp_tls_mandatory_protocols">lmtp_tls_mandatory_protocols</a>
! (default: !SSLv2, !SSLv3)</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>
***************
*** 4872,4878 ****
  </DD>
  
  <DT><b><a name="lmtp_tls_protocols">lmtp_tls_protocols</a>
! (default: empty)</b></DT><DD>
  
  <p> The LMTP-specific version of the <a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> configuration
  parameter. See there for details. </p>
--- 4872,4878 ----
  </DD>
  
  <DT><b><a name="lmtp_tls_protocols">lmtp_tls_protocols</a>
! (default: !SSLv2, !SSLv3)</b></DT><DD>
  
  <p> The LMTP-specific version of the <a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> configuration
  parameter. See there for details. </p>
***************
*** 10772,10797 ****
  </DD>
  
  <DT><b><a name="smtp_tls_ciphers">smtp_tls_ciphers</a>
! (default: export)</b></DT><DD>
  
  <p> The minimum TLS cipher grade that the Postfix SMTP client
  will use with opportunistic TLS encryption. Cipher types listed in
  <a href="postconf.5.html#smtp_tls_exclude_ciphers">smtp_tls_exclude_ciphers</a> are excluded from the base definition of
! the selected cipher grade. The default value "export" ensures maximum
! inter-operability. Because encryption is optional, stronger controls
! are not appropriate, and this setting SHOULD NOT be changed unless the
! change is essential. </p>
  
  <p> When TLS is mandatory the cipher grade is chosen via the
  <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> configuration parameter, see there for syntax
  details. See <a href="postconf.5.html#smtp_tls_policy_maps">smtp_tls_policy_maps</a> for information on how to configure
  ciphers on a per-destination basis. </p>
  
- <p> Example: </p>
- <pre>
- <a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a> = export
- </pre>
- 
  <p> This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers. </p>
--- 10772,10791 ----
  </DD>
  
  <DT><b><a name="smtp_tls_ciphers">smtp_tls_ciphers</a>
! (default: medium)</b></DT><DD>
  
  <p> The minimum TLS cipher grade that the Postfix SMTP client
  will use with opportunistic TLS encryption. Cipher types listed in
  <a href="postconf.5.html#smtp_tls_exclude_ciphers">smtp_tls_exclude_ciphers</a> are excluded from the base definition of
! the selected cipher grade.   The default value is "medium" for
! Postfix releases after the middle of 2015, "export" for older
! releases.  </p>
  
  <p> When TLS is mandatory the cipher grade is chosen via the
  <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> configuration parameter, see there for syntax
  details. See <a href="postconf.5.html#smtp_tls_policy_maps">smtp_tls_policy_maps</a> for information on how to configure
  ciphers on a per-destination basis. </p>
  
  <p> This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers. </p>
***************
*** 11163,11180 ****
  
  <dl>
  <dt><b>export</b></dt>
! <dd> Enable "EXPORT" grade or better OpenSSL
! ciphers.  This is the default for opportunistic encryption. It is
! not recommended for mandatory encryption unless you must enforce TLS
! with "crippled" peers. The underlying cipherlist is specified via the
! <a href="postconf.5.html#tls_export_cipherlist">tls_export_cipherlist</a> configuration parameter, which you are strongly
! encouraged to not change. </dd>
  
  <dt><b>low</b></dt>
! <dd> Enable "LOW" grade or better OpenSSL ciphers.  This
! setting is only appropriate for internal mail servers.  The underlying
  cipherlist is specified via the <a href="postconf.5.html#tls_low_cipherlist">tls_low_cipherlist</a> configuration
! parameter, which you are strongly encouraged to not change. </dd>
  
  <dt><b>medium</b></dt>
  <dd> Enable "MEDIUM" grade or better OpenSSL ciphers.
--- 11157,11172 ----
  
  <dl>
  <dt><b>export</b></dt>
! <dd> Enable "EXPORT" grade or better OpenSSL ciphers.  The underlying
! cipherlist is specified via the <a href="postconf.5.html#tls_export_cipherlist">tls_export_cipherlist</a> configuration
! parameter, which you are strongly encouraged to not change.  This
! choice is insecure and SHOULD NOT be used.  </dd>
  
  <dt><b>low</b></dt>
! <dd> Enable "LOW" grade or better OpenSSL ciphers.  The underlying
  cipherlist is specified via the <a href="postconf.5.html#tls_low_cipherlist">tls_low_cipherlist</a> configuration
! parameter, which you are strongly encouraged to not change.  This
! choice is insecure and SHOULD NOT be used.  </dd>
  
  <dt><b>medium</b></dt>
  <dd> Enable "MEDIUM" grade or better OpenSSL ciphers.
***************
*** 11235,11248 ****
  </DD>
  
  <DT><b><a name="smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a>
! (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
  whitespace, commas or colons. In the policy table "protocols" attribute
  (see <a href="postconf.5.html#smtp_tls_policy_maps">smtp_tls_policy_maps</a>) the only valid separator is colon. An
  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
--- 11227,11242 ----
  </DD>
  
  <DT><b><a name="smtp_tls_mandatory_protocols">smtp_tls_mandatory_protocols</a>
! (default: !SSLv2, !SSLv3)</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
  whitespace, commas or colons. In the policy table "protocols" attribute
  (see <a href="postconf.5.html#smtp_tls_policy_maps">smtp_tls_policy_maps</a>) the only valid separator is colon. An
  empty value means allow all protocols. The valid protocol names, (see
! <b>SSL_get_version(3)</b>), are "SSLv2", "SSLv3" and "TLSv1". The
! default value is "!SSLv2, !SSLv3" for Postfix releases after the
! middle of 2015, "!SSLv2" for older releases. </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
***************
*** 11258,11268 ****
  matches the behavior 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
- default, SSL version 2 will not be used at the "encrypt" security level
- and higher. </p>
- 
  <p> See the documentation of the <a href="postconf.5.html#smtp_tls_policy_maps">smtp_tls_policy_maps</a> parameter and
  <a href="TLS_README.html">TLS_README</a> for more information about security levels. </p>
  
--- 11252,11257 ----
***************
*** 11516,11527 ****
  </DD>
  
  <DT><b><a name="smtp_tls_protocols">smtp_tls_protocols</a>
! (default: !SSLv2)</b></DT><DD>
  
  <p> List of TLS protocols that the Postfix SMTP client will exclude or
! include with opportunistic TLS encryption. Starting with Postfix 2.6,
! the Postfix SMTP client will by default not use the obsolete SSLv2
! protocol. </p>
  
  <p> In <a href="postconf.5.html">main.cf</a> the values are separated by whitespace, commas or
  colons. In the policy table (see <a href="postconf.5.html#smtp_tls_policy_maps">smtp_tls_policy_maps</a>) the only valid
--- 11505,11517 ----
  </DD>
  
  <DT><b><a name="smtp_tls_protocols">smtp_tls_protocols</a>
! (default: !SSLv2, !SSLv3)</b></DT><DD>
  
  <p> List of TLS protocols that the Postfix SMTP client will exclude or
! include with opportunistic TLS encryption. The default value is
! "!SSLv2, !SSLv3" for Postfix releases after the middle of 2015,
! "!SSLv2" for older releases. Before Postfix 2.6, the Postfix SMTP
! client would use all protocols with opportunistic TLS. </p>
  
  <p> In <a href="postconf.5.html">main.cf</a> the values are separated by whitespace, commas or
  colons. In the policy table (see <a href="postconf.5.html#smtp_tls_policy_maps">smtp_tls_policy_maps</a>) the only valid
***************
*** 11535,11541 ****
  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, rather than protocols to exclude, is supported, but not
--- 11525,11531 ----
  unconditionally enabled. </p>
  
  <p> To include a protocol list its name, to exclude it, prefix the name
! with a "!" character. To exclude SSLv2 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, rather than protocols to exclude, is supported, but not
***************
*** 11706,11712 ****
  # can be mitigated by disabling a particular protocol or raising the
  # cipher grade from "export" to "low" or "medium").
  <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
  </pre>
  
  <pre>
--- 11696,11702 ----
  # can be mitigated by disabling a particular protocol or raising the
  # cipher grade from "export" to "low" or "medium").
  <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, !SSLv3
  </pre>
  
  <pre>
***************
*** 14755,14779 ****
  </DD>
  
  <DT><b><a name="smtpd_tls_ciphers">smtpd_tls_ciphers</a>
! (default: export)</b></DT><DD>
  
  <p> The minimum TLS cipher grade that the Postfix SMTP server
  will use with opportunistic TLS encryption. Cipher types listed in
  <a href="postconf.5.html#smtpd_tls_exclude_ciphers">smtpd_tls_exclude_ciphers</a> are excluded from the base definition of
! the selected cipher grade. The default value "export" ensures maximum
! inter-operability. Because encryption is optional, stronger controls
! are not appropriate, and this setting SHOULD NOT be changed unless the
! change is essential. </p>
  
  <p> When TLS is mandatory the cipher grade is chosen via the
  <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a> configuration parameter, see there for syntax
  details. </p>
  
- <p> Example: </p>
- <pre>
- <a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a> = export
- </pre>
- 
  <p> This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a> parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers. </p>
--- 14745,14763 ----
  </DD>
  
  <DT><b><a name="smtpd_tls_ciphers">smtpd_tls_ciphers</a>
! (default: medium)</b></DT><DD>
  
  <p> The minimum TLS cipher grade that the Postfix SMTP server
  will use with opportunistic TLS encryption. Cipher types listed in
  <a href="postconf.5.html#smtpd_tls_exclude_ciphers">smtpd_tls_exclude_ciphers</a> are excluded from the base definition of
! the selected cipher grade.  The default value is "medium" for Postfix
! releases after the middle of 2015, "export" for older releases.
! </p>
  
  <p> When TLS is mandatory the cipher grade is chosen via the
  <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a> configuration parameter, see there for syntax
  details. </p>
  
  <p> This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a> parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers. </p>
***************
*** 15154,15170 ****
  
  <dl>
  <dt><b>export</b></dt>
! <dd> Enable "EXPORT" grade or stronger OpenSSL ciphers.
! This is the most appropriate setting for public MX hosts, and is always
! used with opportunistic TLS encryption. The underlying cipherlist
! is specified via the <a href="postconf.5.html#tls_export_cipherlist">tls_export_cipherlist</a> configuration parameter,
! which you are strongly encouraged to not change. </dd>
  
  <dt><b>low</b></dt>
! <dd> Enable "LOW" grade or stronger OpenSSL ciphers. The
! underlying cipherlist is specified via the <a href="postconf.5.html#tls_low_cipherlist">tls_low_cipherlist</a>
! configuration parameter, which you are strongly encouraged to
! not change. </dd>
  
  <dt><b>medium</b></dt>
  <dd> Enable "MEDIUM" grade or stronger OpenSSL ciphers. These use 128-bit
--- 15138,15153 ----
  
  <dl>
  <dt><b>export</b></dt>
! <dd> Enable "EXPORT" grade or stronger OpenSSL ciphers.  The
! underlying cipherlist is specified via the <a href="postconf.5.html#tls_export_cipherlist">tls_export_cipherlist</a>
! configuration parameter, which you are strongly encouraged to not
! change.  This choice is insecure and SHOULD NOT be used.  </dd>
  
  <dt><b>low</b></dt>
! <dd> Enable "LOW" grade or stronger OpenSSL ciphers. The underlying
! cipherlist is specified via the <a href="postconf.5.html#tls_low_cipherlist">tls_low_cipherlist</a> configuration
! parameter, which you are strongly encouraged to not change.  This
! choice is insecure and SHOULD NOT be used.  </dd>
  
  <dt><b>medium</b></dt>
  <dd> Enable "MEDIUM" grade or stronger OpenSSL ciphers. These use 128-bit
***************
*** 15224,15237 ****
  </DD>
  
  <DT><b><a name="smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a>
! (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
  available SSL/TLS protocol versions.  A non-empty value is a list
  of protocol
  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
--- 15207,15222 ----
  </DD>
  
  <DT><b><a name="smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a>
! (default: !SSLv2, !SSLv3)</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
  available SSL/TLS protocol versions.  A non-empty value is a list
  of protocol
  names separated by whitespace, commas or colons. The supported protocol
! names are "SSLv2", "SSLv3" and "TLSv1", and are not case sensitive.
! The default value is "!SSLv2, !SSLv3" for Postfix releases after
! the middle of 2015, "!SSLv2" for older releases. </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
***************
*** 15247,15257 ****
  matches the behavior 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 default, SSL version 2 will not be used at the "encrypt" security
- level. </p>
- 
  <p> Example: </p>
  
  <pre>
--- 15232,15237 ----
***************
*** 15266,15276 ****
  </DD>
  
  <DT><b><a name="smtpd_tls_protocols">smtpd_tls_protocols</a>
! (default: empty)</b></DT><DD>
  
  <p> List of TLS protocols that the Postfix SMTP server will exclude
! or include with opportunistic TLS encryption. This parameter SHOULD be
! left at its default empty value, allowing all protocols to be used with
  opportunistic TLS. </p>
  
  <p> In <a href="postconf.5.html">main.cf</a> the values are separated by whitespace, commas or
--- 15246,15257 ----
  </DD>
  
  <DT><b><a name="smtpd_tls_protocols">smtpd_tls_protocols</a>
! (default: !SSLv2, !SSLv3)</b></DT><DD>
  
  <p> List of TLS protocols that the Postfix SMTP server will exclude
! or include with opportunistic TLS encryption. The default value is
! "!SSLv2, !SSLv3" for Postfix releases after the middle of 2015,
! empty for older releases allowing all protocols to be used with
  opportunistic TLS. </p>
  
  <p> In <a href="postconf.5.html">main.cf</a> the values are separated by whitespace, commas or
***************
*** 15285,15291 ****
  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, rather than protocols to exclude, is supported, but not
--- 15266,15272 ----
  unconditionally enabled. </p>
  
  <p> To include a protocol list its name, to exclude it, prefix the name
! with a "!" character. To exclude SSLv2 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, rather than protocols to exclude, is supported, but not
***************
*** 15294,15300 ****
  
  <p> Example: </p>
  <pre>
! <a href="postconf.5.html#smtpd_tls_protocols">smtpd_tls_protocols</a> = !SSLv2
  </pre>
  
  <p> This feature is available in Postfix 2.6 and later. </p>
--- 15275,15281 ----
  
  <p> Example: </p>
  <pre>
! <a href="postconf.5.html#smtpd_tls_protocols">smtpd_tls_protocols</a> = !SSLv2, !SSLv3
  </pre>
  
  <p> This feature is available in Postfix 2.6 and later. </p>
***************
*** 15956,15970 ****
  (default: ALL:+RC4:@STRENGTH)</b></DT><DD>
  
  <p> The OpenSSL cipherlist for "EXPORT" or higher grade ciphers. This
! defines the meaning of the "export" setting in <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>,
! <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> and <a href="postconf.5.html#lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>. This is
! the cipherlist for the opportunistic ("may") TLS client security
! level and is the default cipherlist for the SMTP server. You are
! strongly encouraged to not change this setting. With OpenSSL 1.0.0 and
! later the cipherlist may start with an "aNULL:" prefix, which restores
! the 0.9.8-compatible ordering of the aNULL ciphers to the top of the
! list when they are enabled. This prefix is not needed with previous
! OpenSSL releases. </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
--- 15937,15949 ----
  (default: ALL:+RC4:@STRENGTH)</b></DT><DD>
  
  <p> The OpenSSL cipherlist for "EXPORT" or higher grade ciphers. This
! defines the meaning of the "export" setting in <a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a>,
! <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>, <a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a>, <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a>,
! <a href="postconf.5.html#lmtp_tls_ciphers">lmtp_tls_ciphers</a>, and <a href="postconf.5.html#lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>.  With Postfix
! releases before the middle of 2015 this is the default cipherlist
! for the opportunistic ("may") TLS client security level and also
! the default cipherlist for the SMTP server. You are strongly
! encouraged to not change this setting.  </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
***************
*** 15975,15987 ****
  (default: ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)</b></DT><DD>
  
  <p> The OpenSSL cipherlist for "HIGH" grade ciphers. This defines
! the meaning of the "high" setting in <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>,
! <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> and <a href="postconf.5.html#lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>. You are
! strongly encouraged to not change this setting. With OpenSSL 1.0.0 and
! later the cipherlist may start with an "aNULL:" prefix, which restores
! the 0.9.8-compatible ordering of the aNULL ciphers to the top of the
! list when they are enabled. This prefix is not needed with previous
! OpenSSL releases. </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
--- 15954,15963 ----
  (default: ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)</b></DT><DD>
  
  <p> The OpenSSL cipherlist for "HIGH" grade ciphers. This defines
! the meaning of the "high" setting in <a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a>,
! <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>, <a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a>, <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a>,
! <a href="postconf.5.html#lmtp_tls_ciphers">lmtp_tls_ciphers</a>, and <a href="postconf.5.html#lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>. You are strongly
! encouraged to not change this setting.  </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
***************
*** 16011,16023 ****
  (default: ALL:!EXPORT:+RC4:@STRENGTH)</b></DT><DD>
  
  <p> The OpenSSL cipherlist for "LOW" or higher grade ciphers. This defines
! the meaning of the "low" setting in <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>,
! <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> and <a href="postconf.5.html#lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>. You are
! strongly encouraged to not change this setting.  With OpenSSL 1.0.0 and
! later the cipherlist may start with an "aNULL:" prefix, which restores
! the 0.9.8-compatible ordering of the aNULL ciphers to the top of the
! list when they are enabled. This prefix is not needed with previous
! OpenSSL releases. </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
--- 15987,15996 ----
  (default: ALL:!EXPORT:+RC4:@STRENGTH)</b></DT><DD>
  
  <p> The OpenSSL cipherlist for "LOW" or higher grade ciphers. This defines
! the meaning of the "low" setting in <a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a>,
! <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>, <a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a>, <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a>,
! <a href="postconf.5.html#lmtp_tls_ciphers">lmtp_tls_ciphers</a>, and <a href="postconf.5.html#lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>. You are strongly
! encouraged to not change this setting.  </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
***************
*** 16028,16042 ****
  (default: ALL:!EXPORT:!LOW:+RC4:@STRENGTH)</b></DT><DD>
  
  <p> The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers. This
! defines the meaning of the "medium" setting in <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>,
! <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a> and <a href="postconf.5.html#lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>. This is
! the default cipherlist for mandatory TLS encryption in the TLS
! client (with anonymous ciphers disabled when verifying server
! certificates). You are strongly encouraged to not change this
! setting.  With OpenSSL 1.0.0 and later the cipherlist may start with an
! "aNULL:" prefix, which restores the 0.9.8-compatible ordering of the
! aNULL ciphers to the top of the list when they are enabled. This prefix
! is not needed with previous OpenSSL releases. </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
--- 16001,16014 ----
  (default: ALL:!EXPORT:!LOW:+RC4:@STRENGTH)</b></DT><DD>
  
  <p> The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers. This
! defines the meaning of the "medium" setting in <a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a>,
! <a href="postconf.5.html#smtpd_tls_mandatory_ciphers">smtpd_tls_mandatory_ciphers</a>, <a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a>, <a href="postconf.5.html#smtp_tls_mandatory_ciphers">smtp_tls_mandatory_ciphers</a>,
! <a href="postconf.5.html#lmtp_tls_ciphers">lmtp_tls_ciphers</a>, and <a href="postconf.5.html#lmtp_tls_mandatory_ciphers">lmtp_tls_mandatory_ciphers</a>.  This is the
! default cipherlist for mandatory TLS encryption in the TLS client
! (with anonymous ciphers disabled when verifying server certificates).
! This is the default cipherlist for opportunistic TLS with Postfix
! releases after the middle of 2015.  You are strongly encouraged to
! not change this setting.  </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
diff -cr --new-file /var/tmp/postfix-2.10.7/html/smtp.8.html ./html/smtp.8.html
*** /var/tmp/postfix-2.10.7/html/smtp.8.html	2012-07-17 15:40:55.000000000 -0400
--- ./html/smtp.8.html	2015-07-19 19:33:50.000000000 -0400
***************
*** 478,484 ****
                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> (!SSLv2)</b>
                List of SSL/TLS protocols  that  the  Postfix  SMTP
                client will use with mandatory TLS encryption.
  
--- 478,484 ----
                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> (!SSLv2, !SSLv3)</b>
                List of SSL/TLS protocols  that  the  Postfix  SMTP
                client will use with mandatory TLS encryption.
  
***************
*** 551,562 ****
  
         Available in Postfix version 2.6 and later:
  
!        <b><a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> (!SSLv2)</b>
                List of TLS protocols that the Postfix SMTP  client
                will  exclude  or  include  with  opportunistic TLS
                encryption.
  
!        <b><a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a> (export)</b>
                The minimum TLS cipher grade that the Postfix  SMTP
                client  will use with opportunistic TLS encryption.
  
--- 551,562 ----
  
         Available in Postfix version 2.6 and later:
  
!        <b><a href="postconf.5.html#smtp_tls_protocols">smtp_tls_protocols</a> (!SSLv2, !SSLv3)</b>
                List of TLS protocols that the Postfix SMTP  client
                will  exclude  or  include  with  opportunistic TLS
                encryption.
  
!        <b><a href="postconf.5.html#smtp_tls_ciphers">smtp_tls_ciphers</a> (medium)</b>
                The minimum TLS cipher grade that the Postfix  SMTP
                client  will use with opportunistic TLS encryption.
  
diff -cr --new-file /var/tmp/postfix-2.10.7/html/smtpd.8.html ./html/smtpd.8.html
*** /var/tmp/postfix-2.10.7/html/smtpd.8.html	2012-12-26 18:15:30.000000000 -0500
--- ./html/smtpd.8.html	2015-07-19 19:47:37.000000000 -0400
***************
*** 485,491 ****
                exclude from the Postfix SMTP server cipher list at
                mandatory TLS security levels.
  
!        <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.
  
--- 485,491 ----
                exclude from the Postfix SMTP server cipher list at
                mandatory TLS security levels.
  
!        <b><a href="postconf.5.html#smtpd_tls_mandatory_protocols">smtpd_tls_mandatory_protocols</a> (!SSLv2, !SSLv3)</b>
                The SSL/TLS protocols accepted by the Postfix  SMTP
                server with mandatory TLS encryption.
  
***************
*** 550,561 ****
  
         Available in Postfix version 2.6 and later:
  
!        <b><a href="postconf.5.html#smtpd_tls_protocols">smtpd_tls_protocols</a> (empty)</b>
                List  of TLS protocols that the Postfix SMTP server
                will exclude  or  include  with  opportunistic  TLS
                encryption.
  
!        <b><a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a> (export)</b>
                The  minimum TLS cipher grade that the Postfix SMTP
                server will use with opportunistic TLS  encryption.
  
--- 550,561 ----
  
         Available in Postfix version 2.6 and later:
  
!        <b><a href="postconf.5.html#smtpd_tls_protocols">smtpd_tls_protocols</a> (!SSLv2, !SSLv3)</b>
                List  of TLS protocols that the Postfix SMTP server
                will exclude  or  include  with  opportunistic  TLS
                encryption.
  
!        <b><a href="postconf.5.html#smtpd_tls_ciphers">smtpd_tls_ciphers</a> (medium)</b>
                The  minimum TLS cipher grade that the Postfix SMTP
                server will use with opportunistic TLS  encryption.
  
diff -cr --new-file /var/tmp/postfix-2.10.7/makedefs ./makedefs
*** /var/tmp/postfix-2.10.7/makedefs	2015-04-09 08:30:07.000000000 -0400
--- ./makedefs	2015-07-19 10:23:57.000000000 -0400
***************
*** 106,111 ****
--- 106,113 ----
   # Officially supported usage.
   0) SYSTEM=`(uname -s) 2>/dev/null`
      RELEASE=`(uname -r) 2>/dev/null`
+     # No ${x%%y} support in Solaris 11 /bin/sh
+     RELEASE_MAJOR=`expr "$RELEASE" : '\([0-9]*\)'` || exit 1
      VERSION=`(uname -v) 2>/dev/null`
      case "$VERSION" in
       dcosx*) SYSTEM=$VERSION;;
***************
*** 350,356 ****
  		       fi;;
  		esac
  		;;
!     Linux.3*)	SYSTYPE=LINUX3
  		case "$CCARGS" in
  		 *-DNO_DB*) ;;
  		 *) if [ -f /usr/include/db.h ]
--- 352,358 ----
  		       fi;;
  		esac
  		;;
!   Linux.[34].*)	SYSTYPE=LINUX$RELEASE_MAJOR
  		case "$CCARGS" in
  		 *-DNO_DB*) ;;
  		 *) if [ -f /usr/include/db.h ]
diff -cr --new-file /var/tmp/postfix-2.10.7/man/man5/postconf.5 ./man/man5/postconf.5
*** /var/tmp/postfix-2.10.7/man/man5/postconf.5	2013-06-13 10:06:06.000000000 -0400
--- ./man/man5/postconf.5	2015-07-19 19:40:58.000000000 -0400
***************
*** 2689,2695 ****
  configuration parameter.  See there for details.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH lmtp_tls_ciphers (default: export)
  The LMTP-specific version of the smtp_tls_ciphers configuration
  parameter. See there for details.
  .PP
--- 2689,2695 ----
  configuration parameter.  See there for details.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH lmtp_tls_ciphers (default: medium)
  The LMTP-specific version of the smtp_tls_ciphers configuration
  parameter. See there for details.
  .PP
***************
*** 2746,2752 ****
  configuration parameter.  See there for details.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH lmtp_tls_mandatory_ciphers (default: empty)
  The LMTP-specific version of the smtp_tls_mandatory_ciphers
  configuration parameter.  See there for details.
  .PP
--- 2746,2752 ----
  configuration parameter.  See there for details.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH lmtp_tls_mandatory_ciphers (default: medium)
  The LMTP-specific version of the smtp_tls_mandatory_ciphers
  configuration parameter.  See there for details.
  .PP
***************
*** 2756,2762 ****
  configuration parameter.  See there for details.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH lmtp_tls_mandatory_protocols (default: !SSLv2)
  The LMTP-specific version of the smtp_tls_mandatory_protocols
  configuration parameter. See there for details.
  .PP
--- 2756,2762 ----
  configuration parameter.  See there for details.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH lmtp_tls_mandatory_protocols (default: !SSLv2, !SSLv3)
  The LMTP-specific version of the smtp_tls_mandatory_protocols
  configuration parameter. See there for details.
  .PP
***************
*** 2776,2782 ****
  configuration parameter. See there for details.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH lmtp_tls_protocols (default: empty)
  The LMTP-specific version of the smtp_tls_protocols configuration
  parameter. See there for details.
  .PP
--- 2776,2782 ----
  configuration parameter. See there for details.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH lmtp_tls_protocols (default: !SSLv2, !SSLv3)
  The LMTP-specific version of the smtp_tls_protocols configuration
  parameter. See there for details.
  .PP
***************
*** 6593,6621 ****
  .PP
  This feature is available in Postfix version 2.2. It is not used with
  Postfix 2.3 and later; use smtp_tls_mandatory_ciphers instead.
! .SH smtp_tls_ciphers (default: export)
  The minimum TLS cipher grade that the Postfix SMTP client
  will use with opportunistic TLS encryption. Cipher types listed in
  smtp_tls_exclude_ciphers are excluded from the base definition of
! the selected cipher grade. The default value "export" ensures maximum
! inter-operability. Because encryption is optional, stronger controls
! are not appropriate, and this setting SHOULD NOT be changed unless the
! change is essential.
  .PP
  When TLS is mandatory the cipher grade is chosen via the
  smtp_tls_mandatory_ciphers configuration parameter, see there for syntax
  details. See smtp_tls_policy_maps for information on how to configure
  ciphers on a per-destination basis.
  .PP
- Example:
- .nf
- .na
- .ft C
- smtp_tls_ciphers = export
- .fi
- .ad
- .ft R
- .PP
  This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the smtp_tls_mandatory_ciphers parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers.
--- 6593,6611 ----
  .PP
  This feature is available in Postfix version 2.2. It is not used with
  Postfix 2.3 and later; use smtp_tls_mandatory_ciphers instead.
! .SH smtp_tls_ciphers (default: medium)
  The minimum TLS cipher grade that the Postfix SMTP client
  will use with opportunistic TLS encryption. Cipher types listed in
  smtp_tls_exclude_ciphers are excluded from the base definition of
! the selected cipher grade.   The default value is "medium" for
! Postfix releases after the middle of 2015, "export" for older
! releases.
  .PP
  When TLS is mandatory the cipher grade is chosen via the
  smtp_tls_mandatory_ciphers configuration parameter, see there for syntax
  details. See smtp_tls_policy_maps for information on how to configure
  ciphers on a per-destination basis.
  .PP
  This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the smtp_tls_mandatory_ciphers parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers.
***************
*** 6962,6979 ****
  .PP
  The following cipher grades are supported:
  .IP "\fBexport\fR"
! Enable "EXPORT" grade or better OpenSSL
! ciphers.  This is the default for opportunistic encryption. It is
! not recommended for mandatory encryption unless you must enforce TLS
! with "crippled" peers. The underlying cipherlist is specified via the
! tls_export_cipherlist configuration parameter, which you are strongly
! encouraged to not change.
  .br
  .IP "\fBlow\fR"
! Enable "LOW" grade or better OpenSSL ciphers.  This
! setting is only appropriate for internal mail servers.  The underlying
  cipherlist is specified via the tls_low_cipherlist configuration
! parameter, which you are strongly encouraged to not change.
  .br
  .IP "\fBmedium\fR"
  Enable "MEDIUM" grade or better OpenSSL ciphers.
--- 6952,6967 ----
  .PP
  The following cipher grades are supported:
  .IP "\fBexport\fR"
! Enable "EXPORT" grade or better OpenSSL ciphers.  The underlying
! cipherlist is specified via the tls_export_cipherlist configuration
! parameter, which you are strongly encouraged to not change.  This
! choice is insecure and SHOULD NOT be used.
  .br
  .IP "\fBlow\fR"
! Enable "LOW" grade or better OpenSSL ciphers.  The underlying
  cipherlist is specified via the tls_low_cipherlist configuration
! parameter, which you are strongly encouraged to not change.  This
! choice is insecure and SHOULD NOT be used.
  .br
  .IP "\fBmedium\fR"
  Enable "MEDIUM" grade or better OpenSSL ciphers.
***************
*** 7022,7034 ****
  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: !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
  (see smtp_tls_policy_maps) the only valid separator is colon. An
  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
--- 7010,7024 ----
  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: !SSLv2, !SSLv3)
  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
  (see smtp_tls_policy_maps) the only valid separator is colon. An
  empty value means allow all protocols. The valid protocol names, (see
! \\fBfBSSL_get_version\fR(3)\fR), are "SSLv2", "SSLv3" and "TLSv1". The
! default value is "!SSLv2, !SSLv3" for Postfix releases after the
! middle of 2015, "!SSLv2" for older releases.
  .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
***************
*** 7043,7053 ****
  supported, but not recommended. The exclusion form more closely
  matches the behavior 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
- default, SSL version 2 will not be used at the "encrypt" security level
- and higher.
- .PP
  See the documentation of the smtp_tls_policy_maps parameter and
  TLS_README for more information about security levels.
  .PP
--- 7033,7038 ----
***************
*** 7293,7303 ****
  configurations in environments where DNS security is not assured.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH smtp_tls_protocols (default: !SSLv2)
  List of TLS protocols that the Postfix SMTP client will exclude or
! include with opportunistic TLS encryption. Starting with Postfix 2.6,
! the Postfix SMTP client will by default not use the obsolete SSLv2
! protocol.
  .PP
  In main.cf the values are separated by whitespace, commas or
  colons. In the policy table (see smtp_tls_policy_maps) the only valid
--- 7278,7289 ----
  configurations in environments where DNS security is not assured.
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH smtp_tls_protocols (default: !SSLv2, !SSLv3)
  List of TLS protocols that the Postfix SMTP client will exclude or
! include with opportunistic TLS encryption. The default value is
! "!SSLv2, !SSLv3" for Postfix releases after the middle of 2015,
! "!SSLv2" for older releases. Before Postfix 2.6, the Postfix SMTP
! client would use all protocols with opportunistic TLS.
  .PP
  In main.cf the values are separated by whitespace, commas or
  colons. In the policy table (see smtp_tls_policy_maps) the only valid
***************
*** 7311,7317 ****
  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, rather than protocols to exclude, is supported, but not
--- 7297,7303 ----
  unconditionally enabled.
  .PP
  To include a protocol list its name, to exclude it, prefix the name
! with a "!" character. To exclude SSLv2 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, rather than protocols to exclude, is supported, but not
***************
*** 7477,7483 ****
  # can be mitigated by disabling a particular protocol or raising the
  # cipher grade from "export" to "low" or "medium").
  smtp_tls_ciphers = export
! smtp_tls_protocols = !SSLv2
  .fi
  .ad
  .ft R
--- 7463,7469 ----
  # can be mitigated by disabling a particular protocol or raising the
  # cipher grade from "export" to "low" or "medium").
  smtp_tls_ciphers = export
! smtp_tls_protocols = !SSLv2, !SSLv3
  .fi
  .ad
  .ft R
***************
*** 9836,9863 ****
  .PP
  This feature is available with Postfix version 2.2. It is not used with
  Postfix 2.3 and later; use smtpd_tls_mandatory_ciphers instead.
! .SH smtpd_tls_ciphers (default: export)
  The minimum TLS cipher grade that the Postfix SMTP server
  will use with opportunistic TLS encryption. Cipher types listed in
  smtpd_tls_exclude_ciphers are excluded from the base definition of
! the selected cipher grade. The default value "export" ensures maximum
! inter-operability. Because encryption is optional, stronger controls
! are not appropriate, and this setting SHOULD NOT be changed unless the
! change is essential.
  .PP
  When TLS is mandatory the cipher grade is chosen via the
  smtpd_tls_mandatory_ciphers configuration parameter, see there for syntax
  details.
  .PP
- Example:
- .nf
- .na
- .ft C
- smtpd_tls_ciphers = export
- .fi
- .ad
- .ft R
- .PP
  This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the smtpd_tls_mandatory_ciphers parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers.
--- 9822,9838 ----
  .PP
  This feature is available with Postfix version 2.2. It is not used with
  Postfix 2.3 and later; use smtpd_tls_mandatory_ciphers instead.
! .SH smtpd_tls_ciphers (default: medium)
  The minimum TLS cipher grade that the Postfix SMTP server
  will use with opportunistic TLS encryption. Cipher types listed in
  smtpd_tls_exclude_ciphers are excluded from the base definition of
! the selected cipher grade.  The default value is "medium" for Postfix
! releases after the middle of 2015, "export" for older releases.
  .PP
  When TLS is mandatory the cipher grade is chosen via the
  smtpd_tls_mandatory_ciphers configuration parameter, see there for syntax
  details.
  .PP
  This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the smtpd_tls_mandatory_ciphers parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers.
***************
*** 10211,10227 ****
  .PP
  The following cipher grades are supported:
  .IP "\fBexport\fR"
! Enable "EXPORT" grade or stronger OpenSSL ciphers.
! This is the most appropriate setting for public MX hosts, and is always
! used with opportunistic TLS encryption. The underlying cipherlist
! is specified via the tls_export_cipherlist configuration parameter,
! which you are strongly encouraged to not change.
  .br
  .IP "\fBlow\fR"
! Enable "LOW" grade or stronger OpenSSL ciphers. The
! underlying cipherlist is specified via the tls_low_cipherlist
! configuration parameter, which you are strongly encouraged to
! not change.
  .br
  .IP "\fBmedium\fR"
  Enable "MEDIUM" grade or stronger OpenSSL ciphers. These use 128-bit
--- 10186,10201 ----
  .PP
  The following cipher grades are supported:
  .IP "\fBexport\fR"
! Enable "EXPORT" grade or stronger OpenSSL ciphers.  The
! underlying cipherlist is specified via the tls_export_cipherlist
! configuration parameter, which you are strongly encouraged to not
! change.  This choice is insecure and SHOULD NOT be used.
  .br
  .IP "\fBlow\fR"
! Enable "LOW" grade or stronger OpenSSL ciphers. The underlying
! cipherlist is specified via the tls_low_cipherlist configuration
! parameter, which you are strongly encouraged to not change.  This
! choice is insecure and SHOULD NOT be used.
  .br
  .IP "\fBmedium\fR"
  Enable "MEDIUM" grade or stronger OpenSSL ciphers. These use 128-bit
***************
*** 10270,10282 ****
  (see there for syntax details).
  .PP
  This feature is available in Postfix 2.3 and later.
! .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
  of protocol
  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
--- 10244,10258 ----
  (see there for syntax details).
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH smtpd_tls_mandatory_protocols (default: !SSLv2, !SSLv3)
  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
  of protocol
  names separated by whitespace, commas or colons. The supported protocol
  names are "SSLv2", "SSLv3" and "TLSv1", and are not case sensitive.
+ The default value is "!SSLv2, !SSLv3" for Postfix releases after
+ the middle of 2015, "!SSLv2" for older releases.
  .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
***************
*** 10291,10301 ****
  supported, but not recommended. The exclusion form more closely
  matches the behavior 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 default, SSL version 2 will not be used at the "encrypt" security
- level.
- .PP
  Example:
  .PP
  .nf
--- 10267,10272 ----
***************
*** 10309,10318 ****
  .ft R
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH smtpd_tls_protocols (default: empty)
  List of TLS protocols that the Postfix SMTP server will exclude
! or include with opportunistic TLS encryption. This parameter SHOULD be
! left at its default empty value, allowing all protocols to be used with
  opportunistic TLS.
  .PP
  In main.cf the values are separated by whitespace, commas or
--- 10280,10290 ----
  .ft R
  .PP
  This feature is available in Postfix 2.3 and later.
! .SH smtpd_tls_protocols (default: !SSLv2, !SSLv3)
  List of TLS protocols that the Postfix SMTP server will exclude
! or include with opportunistic TLS encryption. The default value is
! "!SSLv2, !SSLv3" for Postfix releases after the middle of 2015,
! empty for older releases allowing all protocols to be used with
  opportunistic TLS.
  .PP
  In main.cf the values are separated by whitespace, commas or
***************
*** 10327,10333 ****
  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, rather than protocols to exclude, is supported, but not
--- 10299,10305 ----
  unconditionally enabled.
  .PP
  To include a protocol list its name, to exclude it, prefix the name
! with a "!" character. To exclude SSLv2 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, rather than protocols to exclude, is supported, but not
***************
*** 10338,10344 ****
  .nf
  .na
  .ft C
! smtpd_tls_protocols = !SSLv2
  .fi
  .ad
  .ft R
--- 10310,10316 ----
  .nf
  .na
  .ft C
! smtpd_tls_protocols = !SSLv2, !SSLv3
  .fi
  .ad
  .ft R
***************
*** 10800,10825 ****
  compiled and linked with OpenSSL 1.0.0 or later.
  .SH tls_export_cipherlist (default: ALL:+RC4:@STRENGTH)
  The OpenSSL cipherlist for "EXPORT" or higher grade ciphers. This
! defines the meaning of the "export" setting in smtpd_tls_mandatory_ciphers,
! smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. This is
! the cipherlist for the opportunistic ("may") TLS client security
! level and is the default cipherlist for the SMTP server. You are
! strongly encouraged to not change this setting. With OpenSSL 1.0.0 and
! later the cipherlist may start with an "aNULL:" prefix, which restores
! the 0.9.8-compatible ordering of the aNULL ciphers to the top of the
! list when they are enabled. This prefix is not needed with previous
! OpenSSL releases.
  .PP
  This feature is available in Postfix 2.3 and later.
  .SH tls_high_cipherlist (default: ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)
  The OpenSSL cipherlist for "HIGH" grade ciphers. This defines
! the meaning of the "high" setting in smtpd_tls_mandatory_ciphers,
! smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. You are
! strongly encouraged to not change this setting. With OpenSSL 1.0.0 and
! later the cipherlist may start with an "aNULL:" prefix, which restores
! the 0.9.8-compatible ordering of the aNULL ciphers to the top of the
! list when they are enabled. This prefix is not needed with previous
! OpenSSL releases.
  .PP
  This feature is available in Postfix 2.3 and later.
  .SH tls_legacy_public_key_fingerprints (default: no)
--- 10772,10792 ----
  compiled and linked with OpenSSL 1.0.0 or later.
  .SH tls_export_cipherlist (default: ALL:+RC4:@STRENGTH)
  The OpenSSL cipherlist for "EXPORT" or higher grade ciphers. This
! defines the meaning of the "export" setting in smtpd_tls_ciphers,
! smtpd_tls_mandatory_ciphers, smtp_tls_ciphers, smtp_tls_mandatory_ciphers,
! lmtp_tls_ciphers, and lmtp_tls_mandatory_ciphers.  With Postfix
! releases before the middle of 2015 this is the default cipherlist
! for the opportunistic ("may") TLS client security level and also
! the default cipherlist for the SMTP server. You are strongly
! encouraged to not change this setting.
  .PP
  This feature is available in Postfix 2.3 and later.
  .SH tls_high_cipherlist (default: ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH)
  The OpenSSL cipherlist for "HIGH" grade ciphers. This defines
! the meaning of the "high" setting in smtpd_tls_ciphers,
! smtpd_tls_mandatory_ciphers, smtp_tls_ciphers, smtp_tls_mandatory_ciphers,
! lmtp_tls_ciphers, and lmtp_tls_mandatory_ciphers. You are strongly
! encouraged to not change this setting.
  .PP
  This feature is available in Postfix 2.3 and later.
  .SH tls_legacy_public_key_fingerprints (default: no)
***************
*** 10837,10862 ****
  This feature is available in Postfix 2.9.6 and later.
  .SH tls_low_cipherlist (default: ALL:!EXPORT:+RC4:@STRENGTH)
  The OpenSSL cipherlist for "LOW" or higher grade ciphers. This defines
! the meaning of the "low" setting in smtpd_tls_mandatory_ciphers,
! smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. You are
! strongly encouraged to not change this setting.  With OpenSSL 1.0.0 and
! later the cipherlist may start with an "aNULL:" prefix, which restores
! the 0.9.8-compatible ordering of the aNULL ciphers to the top of the
! list when they are enabled. This prefix is not needed with previous
! OpenSSL releases.
  .PP
  This feature is available in Postfix 2.3 and later.
  .SH tls_medium_cipherlist (default: ALL:!EXPORT:!LOW:+RC4:@STRENGTH)
  The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers. This
! defines the meaning of the "medium" setting in smtpd_tls_mandatory_ciphers,
! smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. This is
! the default cipherlist for mandatory TLS encryption in the TLS
! client (with anonymous ciphers disabled when verifying server
! certificates). You are strongly encouraged to not change this
! setting.  With OpenSSL 1.0.0 and later the cipherlist may start with an
! "aNULL:" prefix, which restores the 0.9.8-compatible ordering of the
! aNULL ciphers to the top of the list when they are enabled. This prefix
! is not needed with previous OpenSSL releases.
  .PP
  This feature is available in Postfix 2.3 and later.
  .SH tls_null_cipherlist (default: eNULL:!aNULL)
--- 10804,10825 ----
  This feature is available in Postfix 2.9.6 and later.
  .SH tls_low_cipherlist (default: ALL:!EXPORT:+RC4:@STRENGTH)
  The OpenSSL cipherlist for "LOW" or higher grade ciphers. This defines
! the meaning of the "low" setting in smtpd_tls_ciphers,
! smtpd_tls_mandatory_ciphers, smtp_tls_ciphers, smtp_tls_mandatory_ciphers,
! lmtp_tls_ciphers, and lmtp_tls_mandatory_ciphers. You are strongly
! encouraged to not change this setting.
  .PP
  This feature is available in Postfix 2.3 and later.
  .SH tls_medium_cipherlist (default: ALL:!EXPORT:!LOW:+RC4:@STRENGTH)
  The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers. This
! defines the meaning of the "medium" setting in smtpd_tls_ciphers,
! smtpd_tls_mandatory_ciphers, smtp_tls_ciphers, smtp_tls_mandatory_ciphers,
! lmtp_tls_ciphers, and lmtp_tls_mandatory_ciphers.  This is the
! default cipherlist for mandatory TLS encryption in the TLS client
! (with anonymous ciphers disabled when verifying server certificates).
! This is the default cipherlist for opportunistic TLS with Postfix
! releases after the middle of 2015.  You are strongly encouraged to
! not change this setting.
  .PP
  This feature is available in Postfix 2.3 and later.
  .SH tls_null_cipherlist (default: eNULL:!aNULL)
diff -cr --new-file /var/tmp/postfix-2.10.7/man/man8/smtp.8 ./man/man8/smtp.8
*** /var/tmp/postfix-2.10.7/man/man8/smtp.8	2012-07-17 15:40:55.000000000 -0400
--- ./man/man8/smtp.8	2015-07-19 19:33:50.000000000 -0400
***************
*** 399,405 ****
  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 (!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"
--- 399,405 ----
  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 (!SSLv2, !SSLv3)\fR"
  List of SSL/TLS protocols that the Postfix SMTP client will use with
  mandatory TLS encryption.
  .IP "\fBsmtp_tls_scert_verifydepth (9)\fR"
***************
*** 450,459 ****
  certificate fingerprints.
  .PP
  Available in Postfix version 2.6 and later:
! .IP "\fBsmtp_tls_protocols (!SSLv2)\fR"
  List of TLS protocols that the Postfix SMTP client will exclude or
  include with opportunistic TLS encryption.
! .IP "\fBsmtp_tls_ciphers (export)\fR"
  The minimum TLS cipher grade that the Postfix SMTP client
  will use with opportunistic TLS encryption.
  .IP "\fBsmtp_tls_eccert_file (empty)\fR"
--- 450,459 ----
  certificate fingerprints.
  .PP
  Available in Postfix version 2.6 and later:
! .IP "\fBsmtp_tls_protocols (!SSLv2, !SSLv3)\fR"
  List of TLS protocols that the Postfix SMTP client will exclude or
  include with opportunistic TLS encryption.
! .IP "\fBsmtp_tls_ciphers (medium)\fR"
  The minimum TLS cipher grade that the Postfix SMTP client
  will use with opportunistic TLS encryption.
  .IP "\fBsmtp_tls_eccert_file (empty)\fR"
diff -cr --new-file /var/tmp/postfix-2.10.7/man/man8/smtpd.8 ./man/man8/smtpd.8
*** /var/tmp/postfix-2.10.7/man/man8/smtpd.8	2012-12-26 18:15:29.000000000 -0500
--- ./man/man8/smtpd.8	2015-07-19 19:47:11.000000000 -0400
***************
*** 412,418 ****
  .IP "\fBsmtpd_tls_mandatory_exclude_ciphers (empty)\fR"
  Additional list of ciphers or cipher types to exclude from the
  Postfix SMTP server cipher list at mandatory TLS security levels.
! .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"
--- 412,418 ----
  .IP "\fBsmtpd_tls_mandatory_exclude_ciphers (empty)\fR"
  Additional list of ciphers or cipher types to exclude from the
  Postfix SMTP server cipher list at mandatory TLS security levels.
! .IP "\fBsmtpd_tls_mandatory_protocols (!SSLv2, !SSLv3)\fR"
  The SSL/TLS protocols accepted by the Postfix SMTP server with
  mandatory TLS encryption.
  .IP "\fBsmtpd_tls_received_header (no)\fR"
***************
*** 456,465 ****
  for \fBcheck_ccert_access\fR and \fBpermit_tls_clientcerts\fR.
  .PP
  Available in Postfix version 2.6 and later:
! .IP "\fBsmtpd_tls_protocols (empty)\fR"
  List of TLS protocols that the Postfix SMTP server will exclude
  or include with opportunistic TLS encryption.
! .IP "\fBsmtpd_tls_ciphers (export)\fR"
  The minimum TLS cipher grade that the Postfix SMTP server
  will use with opportunistic TLS encryption.
  .IP "\fBsmtpd_tls_eccert_file (empty)\fR"
--- 456,465 ----
  for \fBcheck_ccert_access\fR and \fBpermit_tls_clientcerts\fR.
  .PP
  Available in Postfix version 2.6 and later:
! .IP "\fBsmtpd_tls_protocols (!SSLv2, !SSLv3)\fR"
  List of TLS protocols that the Postfix SMTP server will exclude
  or include with opportunistic TLS encryption.
! .IP "\fBsmtpd_tls_ciphers (medium)\fR"
  The minimum TLS cipher grade that the Postfix SMTP server
  will use with opportunistic TLS encryption.
  .IP "\fBsmtpd_tls_eccert_file (empty)\fR"
diff -cr --new-file /var/tmp/postfix-2.10.7/proto/TLS_README.html ./proto/TLS_README.html
*** /var/tmp/postfix-2.10.7/proto/TLS_README.html	2013-02-03 09:38:29.000000000 -0500
--- ./proto/TLS_README.html	2015-07-20 19:11:33.803653000 -0400
***************
*** 725,738 ****
  
  <h3><a name="server_cipher">Server-side cipher controls</a> </h3>
  
! <p> The Postfix SMTP server supports 5 distinct cipher security levels
! as specified by the smtpd_tls_mandatory_ciphers configuration parameter,
! which determines the cipher grade with mandatory TLS encryption. The
! default value is "medium" which is essentially 128-bit encryption or better.
! With opportunistic TLS encryption, the minimum accepted cipher grade is
! typically "export". The corresponding smtpd_tls_ciphers parameter
! (Postfix &ge; 2.6) controls the cipher grade used with opportunistic
! TLS. </p>
  
  <p> By default anonymous ciphers are enabled. They are automatically
  disabled when remote SMTP client certificates are requested. If
--- 725,740 ----
  
  <h3><a name="server_cipher">Server-side cipher controls</a> </h3>
  
! <p> The Postfix SMTP server supports 5 distinct cipher grades as
! specified by the smtpd_tls_mandatory_ciphers configuration parameter,
! which determines the minimum cipher grade with mandatory TLS
! encryption.  The default minimum cipher grade for mandatory TLS is
! "medium" which is essentially 128-bit encryption or better.  The
! smtpd_tls_ciphers parameter (Postfix &ge; 2.6) controls the minimum
! cipher grade used with opportunistic TLS.  Here, the default minimum
! cipher grade is "medium" for Postfix releases after the middle of
! 2015, "export" for older Postfix releases. With Postfix &lt; 2.6,
! the minimum opportunistic TLS cipher grade is always "export".  </p>
  
  <p> By default anonymous ciphers are enabled. They are automatically
  disabled when remote SMTP client certificates are requested. If
***************
*** 743,759 ****
  a remote SMTP client to check the server certificate, so excluding
  anonymous ciphers is generally unnecessary. </p>
  
! <p> The "smtpd_tls_ciphers" configuration parameter (Postfix &ge;
! 2.6) provides control over the minimum cipher grade for opportunistic
! TLS. With
! Postfix &lt; 2.6, the minimum opportunistic TLS cipher grade is always
! "export". </p>
! 
! <p> 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 &ge; 2.6)
  controls the SSL/TLS protocols used with opportunistic TLS. </p>
  
  <p> Note that the OpenSSL library only supports protocol exclusion
--- 745,756 ----
  a remote SMTP client to check the server certificate, so excluding
  anonymous ciphers is generally unnecessary. </p>
  
! <p> With mandatory and opportunistic TLS encryption, the Postfix
! SMTP server by default disables SSLv2 and SSLv3 with Postfix releases
! after the middle of 2015; older releases only disable SSLv2 for
! mandatory TLS. The mandatory TLS protocol list is specified via the
  smtpd_tls_mandatory_protocols configuration parameter.  The
! smtpd_tls_protocols parameter (Postfix &ge; 2.6)
  controls the SSL/TLS protocols used with opportunistic TLS. </p>
  
  <p> Note that the OpenSSL library only supports protocol exclusion
***************
*** 982,995 ****
  Opportunistic TLS can be configured by setting "smtp_tls_security_level = may".
  For LMTP, use the corresponding "lmtp_" parameter. </p>
  
! <p> Since sending in the clear is acceptable, demanding stronger
! than default TLS security mostly reduces inter-operability. If you
! must restrict TLS protocol or cipher selection even with opportunistic
! TLS, the "smtp_tls_ciphers" and "smtp_tls_protocols" configuration
! parameters (Postfix &ge; 2.6) provide control over the protocols
! and cipher grade
! used with opportunistic TLS. With earlier releases the opportunistic TLS
! cipher grade is always "export" and no protocols are disabled. </p>
  
  <p> With opportunistic TLS, mail delivery continues even if the
  server certificate is untrusted or bears the wrong name.  
--- 979,989 ----
  Opportunistic TLS can be configured by setting "smtp_tls_security_level = may".
  For LMTP, use the corresponding "lmtp_" parameter. </p>
  
! <p> The "smtp_tls_ciphers" and "smtp_tls_protocols" configuration
! parameters (Postfix &ge; 2.6) provide control over the cipher grade
! and protocols used with opportunistic TLS.  With earlier Postfix
! releases, opportunistic TLS always uses the cipher grade "export"
! and enables all protocols. </p>
  
  <p> With opportunistic TLS, mail delivery continues even if the
  server certificate is untrusted or bears the wrong name.  
***************
*** 1065,1071 ****
  <p> In the example below, traffic to <i>example.com</i> and its sub-domains
  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>
  
--- 1059,1065 ----
  <p> In the example below, traffic to <i>example.com</i> and its sub-domains
  via the corresponding MX hosts always uses TLS. The SSLv2 protocol
  will be disabled (the default setting of smtp_tls_mandatory_protocols
! excludes SSLv2+3). Only high- or medium-strength (i.e. 128 bit or
  better) ciphers will be used by default for all "encrypt" security
  level sessions. </p>
  
***************
*** 1943,1949 ****
  
  <h3> <a name="client_cipher">Client-side cipher controls </a> </h3>
  
! <p> The Postfix SMTP client supports 5 distinct cipher security levels
  as specified by the smtp_tls_mandatory_ciphers configuration
  parameter. This setting controls the minimum acceptable SMTP client
  TLS cipher grade for use with mandatory TLS encryption. The default
--- 1937,1943 ----
  
  <h3> <a name="client_cipher">Client-side cipher controls </a> </h3>
  
! <p> The Postfix SMTP client supports 5 distinct cipher grades
  as specified by the smtp_tls_mandatory_ciphers configuration
  parameter. This setting controls the minimum acceptable SMTP client
  TLS cipher grade for use with mandatory TLS encryption. The default
***************
*** 1964,1976 ****
  little point in requesting them. </p>
  
  <p> The "smtp_tls_ciphers" configuration parameter (Postfix &ge; 2.6)
! provides control over the minimum cipher grade for opportunistic TLS. With
! Postfix &lt; 2.6, the minimum opportunistic TLS cipher grade is always
! "export". </p>
! 
! <p> 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 &ge; 2.6) controls
  the SSL/TLS protocols used with opportunistic TLS. </p>
--- 1958,1972 ----
  little point in requesting them. </p>
  
  <p> The "smtp_tls_ciphers" configuration parameter (Postfix &ge; 2.6)
! provides control over the minimum cipher grade for opportunistic TLS.
! The default minimum cipher grade for opportunistic TLS is "medium"
! for Postfix releases after the middle of 2015, and "export" for
! older releases.  With Postfix &lt; 2.6, the minimum opportunistic
! TLS cipher grade is always "export".  </p>
! 
! <p> With mandatory and opportunistic TLS encryption, the Postfix
! SMTP client will by default disable SSLv2 and SSLv3. The mandatory
! TLS protocol list is specified via the
  smtp_tls_mandatory_protocols configuration parameter.  The corresponding
  smtp_tls_protocols parameter (Postfix &ge; 2.6) controls
  the SSL/TLS protocols used with opportunistic TLS. </p>
***************
*** 1988,1994 ****
      # Alternative form.
      smtp_tls_mandatory_protocols = SSLv3, TLSv1
      # Also available with Postfix &ge; 2.6:
!     smtp_tls_ciphers = export
      smtp_tls_protocols = !SSLv2
  </pre>
  </blockquote>
--- 1984,1990 ----
      # Alternative form.
      smtp_tls_mandatory_protocols = SSLv3, TLSv1
      # Also available with Postfix &ge; 2.6:
!     smtp_tls_ciphers = medium
      smtp_tls_protocols = !SSLv2
  </pre>
  </blockquote>
diff -cr --new-file /var/tmp/postfix-2.10.7/proto/postconf.proto ./proto/postconf.proto
*** /var/tmp/postfix-2.10.7/proto/postconf.proto	2013-06-13 09:48:55.000000000 -0400
--- ./proto/postconf.proto	2015-07-19 19:40:53.244776000 -0400
***************
*** 10661,10674 ****
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
! %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
  whitespace, commas or colons. In the policy table "protocols" attribute
  (see smtp_tls_policy_maps) the only valid separator is colon. An
  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
--- 10661,10676 ----
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
! %PARAM smtp_tls_mandatory_protocols !SSLv2, !SSLv3
  
  <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
  whitespace, commas or colons. In the policy table "protocols" attribute
  (see smtp_tls_policy_maps) the only valid separator is colon. An
  empty value means allow all protocols. The valid protocol names, (see
! <b>SSL_get_version(3)</b>), are "SSLv2", "SSLv3" and "TLSv1". The
! default value is "!SSLv2, !SSLv3" for Postfix releases after the
! middle of 2015, "!SSLv2" for older releases. </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
***************
*** 10684,10694 ****
  matches the behavior 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
- default, SSL version 2 will not be used at the "encrypt" security level
- and higher. </p>
- 
  <p> See the documentation of the smtp_tls_policy_maps parameter and
  TLS_README for more information about security levels. </p>
  
--- 10686,10691 ----
***************
*** 10828,10834 ****
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
! %PARAM lmtp_tls_mandatory_protocols !SSLv2
  
  <p> The LMTP-specific version of the smtp_tls_mandatory_protocols
  configuration parameter. See there for details. </p>
--- 10825,10831 ----
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
! %PARAM lmtp_tls_mandatory_protocols !SSLv2, !SSLv3
  
  <p> The LMTP-specific version of the smtp_tls_mandatory_protocols
  configuration parameter. See there for details. </p>
***************
*** 10849,10862 ****
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
! %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
  available SSL/TLS protocol versions.  A non-empty value is a list
  of protocol
  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
--- 10846,10861 ----
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
! %PARAM smtpd_tls_mandatory_protocols !SSLv2, !SSLv3
  
  <p> 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
  of protocol
  names separated by whitespace, commas or colons. The supported protocol
! names are "SSLv2", "SSLv3" and "TLSv1", and are not case sensitive.
! The default value is "!SSLv2, !SSLv3" for Postfix releases after
! the middle of 2015, "!SSLv2" for older releases. </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
***************
*** 10872,10882 ****
  matches the behavior 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 default, SSL version 2 will not be used at the "encrypt" security
- level. </p>
- 
  <p> Example: </p>
  
  <pre>
--- 10871,10876 ----
***************
*** 10973,10979 ****
  # can be mitigated by disabling a particular protocol or raising the
  # cipher grade from "export" to "low" or "medium").
  smtp_tls_ciphers = export
! smtp_tls_protocols = !SSLv2
  </pre>
  
  <pre>
--- 10967,10973 ----
  # can be mitigated by disabling a particular protocol or raising the
  # cipher grade from "export" to "low" or "medium").
  smtp_tls_ciphers = export
! smtp_tls_protocols = !SSLv2, !SSLv3
  </pre>
  
  <pre>
***************
*** 11231,11247 ****
  
  <dl>
  <dt><b>export</b></dt>
! <dd> Enable "EXPORT" grade or stronger OpenSSL ciphers.
! This is the most appropriate setting for public MX hosts, and is always
! used with opportunistic TLS encryption. The underlying cipherlist
! is specified via the tls_export_cipherlist configuration parameter,
! which you are strongly encouraged to not change. </dd>
  
  <dt><b>low</b></dt>
! <dd> Enable "LOW" grade or stronger OpenSSL ciphers. The
! underlying cipherlist is specified via the tls_low_cipherlist
! configuration parameter, which you are strongly encouraged to
! not change. </dd>
  
  <dt><b>medium</b></dt>
  <dd> Enable "MEDIUM" grade or stronger OpenSSL ciphers. These use 128-bit
--- 11225,11240 ----
  
  <dl>
  <dt><b>export</b></dt>
! <dd> Enable "EXPORT" grade or stronger OpenSSL ciphers.  The
! underlying cipherlist is specified via the tls_export_cipherlist
! configuration parameter, which you are strongly encouraged to not
! change.  This choice is insecure and SHOULD NOT be used.  </dd>
  
  <dt><b>low</b></dt>
! <dd> Enable "LOW" grade or stronger OpenSSL ciphers. The underlying
! cipherlist is specified via the tls_low_cipherlist configuration
! parameter, which you are strongly encouraged to not change.  This
! choice is insecure and SHOULD NOT be used.  </dd>
  
  <dt><b>medium</b></dt>
  <dd> Enable "MEDIUM" grade or stronger OpenSSL ciphers. These use 128-bit
***************
*** 11338,11355 ****
  
  <dl>
  <dt><b>export</b></dt>
! <dd> Enable "EXPORT" grade or better OpenSSL
! ciphers.  This is the default for opportunistic encryption. It is
! not recommended for mandatory encryption unless you must enforce TLS
! with "crippled" peers. The underlying cipherlist is specified via the
! tls_export_cipherlist configuration parameter, which you are strongly
! encouraged to not change. </dd>
  
  <dt><b>low</b></dt>
! <dd> Enable "LOW" grade or better OpenSSL ciphers.  This
! setting is only appropriate for internal mail servers.  The underlying
  cipherlist is specified via the tls_low_cipherlist configuration
! parameter, which you are strongly encouraged to not change. </dd>
  
  <dt><b>medium</b></dt>
  <dd> Enable "MEDIUM" grade or better OpenSSL ciphers.
--- 11331,11346 ----
  
  <dl>
  <dt><b>export</b></dt>
! <dd> Enable "EXPORT" grade or better OpenSSL ciphers.  The underlying
! cipherlist is specified via the tls_export_cipherlist configuration
! parameter, which you are strongly encouraged to not change.  This
! choice is insecure and SHOULD NOT be used.  </dd>
  
  <dt><b>low</b></dt>
! <dd> Enable "LOW" grade or better OpenSSL ciphers.  The underlying
  cipherlist is specified via the tls_low_cipherlist configuration
! parameter, which you are strongly encouraged to not change.  This
! choice is insecure and SHOULD NOT be used.  </dd>
  
  <dt><b>medium</b></dt>
  <dd> Enable "MEDIUM" grade or better OpenSSL ciphers.
***************
*** 11435,11490 ****
  %PARAM tls_high_cipherlist ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH
  
  <p> The OpenSSL cipherlist for "HIGH" grade ciphers. This defines
! the meaning of the "high" setting in smtpd_tls_mandatory_ciphers,
! smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. You are
! strongly encouraged to not change this setting. With OpenSSL 1.0.0 and
! later the cipherlist may start with an "aNULL:" prefix, which restores
! the 0.9.8-compatible ordering of the aNULL ciphers to the top of the
! list when they are enabled. This prefix is not needed with previous
! OpenSSL releases. </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
  %PARAM tls_medium_cipherlist ALL:!EXPORT:!LOW:+RC4:@STRENGTH
  
  <p> The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers. This
! defines the meaning of the "medium" setting in smtpd_tls_mandatory_ciphers,
! smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. This is
! the default cipherlist for mandatory TLS encryption in the TLS
! client (with anonymous ciphers disabled when verifying server
! certificates). You are strongly encouraged to not change this
! setting.  With OpenSSL 1.0.0 and later the cipherlist may start with an
! "aNULL:" prefix, which restores the 0.9.8-compatible ordering of the
! aNULL ciphers to the top of the list when they are enabled. This prefix
! is not needed with previous OpenSSL releases. </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
  %PARAM tls_low_cipherlist ALL:!EXPORT:+RC4:@STRENGTH
  
  <p> The OpenSSL cipherlist for "LOW" or higher grade ciphers. This defines
! the meaning of the "low" setting in smtpd_tls_mandatory_ciphers,
! smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. You are
! strongly encouraged to not change this setting.  With OpenSSL 1.0.0 and
! later the cipherlist may start with an "aNULL:" prefix, which restores
! the 0.9.8-compatible ordering of the aNULL ciphers to the top of the
! list when they are enabled. This prefix is not needed with previous
! OpenSSL releases. </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
  %PARAM tls_export_cipherlist ALL:+RC4:@STRENGTH
  
  <p> The OpenSSL cipherlist for "EXPORT" or higher grade ciphers. This
! defines the meaning of the "export" setting in smtpd_tls_mandatory_ciphers,
! smtp_tls_mandatory_ciphers and lmtp_tls_mandatory_ciphers. This is
! the cipherlist for the opportunistic ("may") TLS client security
! level and is the default cipherlist for the SMTP server. You are
! strongly encouraged to not change this setting. With OpenSSL 1.0.0 and
! later the cipherlist may start with an "aNULL:" prefix, which restores
! the 0.9.8-compatible ordering of the aNULL ciphers to the top of the
! list when they are enabled. This prefix is not needed with previous
! OpenSSL releases. </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
--- 11426,11472 ----
  %PARAM tls_high_cipherlist ALL:!EXPORT:!LOW:!MEDIUM:+RC4:@STRENGTH
  
  <p> The OpenSSL cipherlist for "HIGH" grade ciphers. This defines
! the meaning of the "high" setting in smtpd_tls_ciphers,
! smtpd_tls_mandatory_ciphers, smtp_tls_ciphers, smtp_tls_mandatory_ciphers,
! lmtp_tls_ciphers, and lmtp_tls_mandatory_ciphers. You are strongly
! encouraged to not change this setting.  </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
  %PARAM tls_medium_cipherlist ALL:!EXPORT:!LOW:+RC4:@STRENGTH
  
  <p> The OpenSSL cipherlist for "MEDIUM" or higher grade ciphers. This
! defines the meaning of the "medium" setting in smtpd_tls_ciphers,
! smtpd_tls_mandatory_ciphers, smtp_tls_ciphers, smtp_tls_mandatory_ciphers,
! lmtp_tls_ciphers, and lmtp_tls_mandatory_ciphers.  This is the
! default cipherlist for mandatory TLS encryption in the TLS client
! (with anonymous ciphers disabled when verifying server certificates).
! This is the default cipherlist for opportunistic TLS with Postfix
! releases after the middle of 2015.  You are strongly encouraged to
! not change this setting.  </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
  %PARAM tls_low_cipherlist ALL:!EXPORT:+RC4:@STRENGTH
  
  <p> The OpenSSL cipherlist for "LOW" or higher grade ciphers. This defines
! the meaning of the "low" setting in smtpd_tls_ciphers,
! smtpd_tls_mandatory_ciphers, smtp_tls_ciphers, smtp_tls_mandatory_ciphers,
! lmtp_tls_ciphers, and lmtp_tls_mandatory_ciphers. You are strongly
! encouraged to not change this setting.  </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
  %PARAM tls_export_cipherlist ALL:+RC4:@STRENGTH
  
  <p> The OpenSSL cipherlist for "EXPORT" or higher grade ciphers. This
! defines the meaning of the "export" setting in smtpd_tls_ciphers,
! smtpd_tls_mandatory_ciphers, smtp_tls_ciphers, smtp_tls_mandatory_ciphers,
! lmtp_tls_ciphers, and lmtp_tls_mandatory_ciphers.  With Postfix
! releases before the middle of 2015 this is the default cipherlist
! for the opportunistic ("may") TLS client security level and also
! the default cipherlist for the SMTP server. You are strongly
! encouraged to not change this setting.  </p>
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
***************
*** 11498,11504 ****
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
! %PARAM lmtp_tls_mandatory_ciphers
  
  <p> The LMTP-specific version of the smtp_tls_mandatory_ciphers
  configuration parameter.  See there for details. </p>
--- 11480,11486 ----
  
  <p> This feature is available in Postfix 2.3 and later. </p>
  
! %PARAM lmtp_tls_mandatory_ciphers medium
  
  <p> The LMTP-specific version of the smtp_tls_mandatory_ciphers
  configuration parameter.  See there for details. </p>
***************
*** 11956,11967 ****
  
  <p> This feature is available in Postfix 2.5 and later. </p>
  
! %PARAM smtp_tls_protocols !SSLv2
  
  <p> List of TLS protocols that the Postfix SMTP client will exclude or
! include with opportunistic TLS encryption. Starting with Postfix 2.6,
! the Postfix SMTP client will by default not use the obsolete SSLv2
! protocol. </p>
  
  <p> In main.cf the values are separated by whitespace, commas or
  colons. In the policy table (see smtp_tls_policy_maps) the only valid
--- 11938,11950 ----
  
  <p> This feature is available in Postfix 2.5 and later. </p>
  
! %PARAM smtp_tls_protocols !SSLv2, !SSLv3
  
  <p> List of TLS protocols that the Postfix SMTP client will exclude or
! include with opportunistic TLS encryption. The default value is
! "!SSLv2, !SSLv3" for Postfix releases after the middle of 2015,
! "!SSLv2" for older releases. Before Postfix 2.6, the Postfix SMTP
! client would use all protocols with opportunistic TLS. </p>
  
  <p> In main.cf the values are separated by whitespace, commas or
  colons. In the policy table (see smtp_tls_policy_maps) the only valid
***************
*** 11975,11981 ****
  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, rather than protocols to exclude, is supported, but not
--- 11958,11964 ----
  unconditionally enabled. </p>
  
  <p> To include a protocol list its name, to exclude it, prefix the name
! with a "!" character. To exclude SSLv2 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, rather than protocols to exclude, is supported, but not
***************
*** 11990,12000 ****
  
  <p> This feature is available in Postfix 2.6 and later. </p>
  
! %PARAM smtpd_tls_protocols
  
  <p> List of TLS protocols that the Postfix SMTP server will exclude
! or include with opportunistic TLS encryption. This parameter SHOULD be
! left at its default empty value, allowing all protocols to be used with
  opportunistic TLS. </p>
  
  <p> In main.cf the values are separated by whitespace, commas or
--- 11973,11984 ----
  
  <p> This feature is available in Postfix 2.6 and later. </p>
  
! %PARAM smtpd_tls_protocols !SSLv2, !SSLv3
  
  <p> List of TLS protocols that the Postfix SMTP server will exclude
! or include with opportunistic TLS encryption. The default value is
! "!SSLv2, !SSLv3" for Postfix releases after the middle of 2015,
! empty for older releases allowing all protocols to be used with
  opportunistic TLS. </p>
  
  <p> In main.cf the values are separated by whitespace, commas or
***************
*** 12009,12015 ****
  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, rather than protocols to exclude, is supported, but not
--- 11993,11999 ----
  unconditionally enabled. </p>
  
  <p> To include a protocol list its name, to exclude it, prefix the name
! with a "!" character. To exclude SSLv2 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, rather than protocols to exclude, is supported, but not
***************
*** 12018,12083 ****
  
  <p> Example: </p>
  <pre>
! smtpd_tls_protocols = !SSLv2
  </pre>
  
  <p> This feature is available in Postfix 2.6 and later. </p>
  
! %PARAM lmtp_tls_protocols
  
  <p> The LMTP-specific version of the smtp_tls_protocols configuration
  parameter. See there for details. </p>
  
  <p> This feature is available in Postfix 2.6 and later. </p>
  
! %PARAM smtp_tls_ciphers export
  
  <p> The minimum TLS cipher grade that the Postfix SMTP client
  will use with opportunistic TLS encryption. Cipher types listed in
  smtp_tls_exclude_ciphers are excluded from the base definition of
! the selected cipher grade. The default value "export" ensures maximum
! inter-operability. Because encryption is optional, stronger controls
! are not appropriate, and this setting SHOULD NOT be changed unless the
! change is essential. </p>
  
  <p> When TLS is mandatory the cipher grade is chosen via the
  smtp_tls_mandatory_ciphers configuration parameter, see there for syntax
  details. See smtp_tls_policy_maps for information on how to configure
  ciphers on a per-destination basis. </p>
  
- <p> Example: </p>
- <pre>
- smtp_tls_ciphers = export
- </pre>
- 
  <p> This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the smtp_tls_mandatory_ciphers parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers. </p>
  
! %PARAM smtpd_tls_ciphers export
  
  <p> The minimum TLS cipher grade that the Postfix SMTP server
  will use with opportunistic TLS encryption. Cipher types listed in
  smtpd_tls_exclude_ciphers are excluded from the base definition of
! the selected cipher grade. The default value "export" ensures maximum
! inter-operability. Because encryption is optional, stronger controls
! are not appropriate, and this setting SHOULD NOT be changed unless the
! change is essential. </p>
  
  <p> When TLS is mandatory the cipher grade is chosen via the
  smtpd_tls_mandatory_ciphers configuration parameter, see there for syntax
  details. </p>
  
- <p> Example: </p>
- <pre>
- smtpd_tls_ciphers = export
- </pre>
- 
  <p> This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the smtpd_tls_mandatory_ciphers parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers. </p>
  
! %PARAM lmtp_tls_ciphers export
  
  <p> The LMTP-specific version of the smtp_tls_ciphers configuration
  parameter. See there for details. </p>
--- 12002,12055 ----
  
  <p> Example: </p>
  <pre>
! smtpd_tls_protocols = !SSLv2, !SSLv3
  </pre>
  
  <p> This feature is available in Postfix 2.6 and later. </p>
  
! %PARAM lmtp_tls_protocols !SSLv2, !SSLv3
  
  <p> The LMTP-specific version of the smtp_tls_protocols configuration
  parameter. See there for details. </p>
  
  <p> This feature is available in Postfix 2.6 and later. </p>
  
! %PARAM smtp_tls_ciphers medium
  
  <p> The minimum TLS cipher grade that the Postfix SMTP client
  will use with opportunistic TLS encryption. Cipher types listed in
  smtp_tls_exclude_ciphers are excluded from the base definition of
! the selected cipher grade.   The default value is "medium" for
! Postfix releases after the middle of 2015, "export" for older
! releases.  </p>
  
  <p> When TLS is mandatory the cipher grade is chosen via the
  smtp_tls_mandatory_ciphers configuration parameter, see there for syntax
  details. See smtp_tls_policy_maps for information on how to configure
  ciphers on a per-destination basis. </p>
  
  <p> This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the smtp_tls_mandatory_ciphers parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers. </p>
  
! %PARAM smtpd_tls_ciphers medium
  
  <p> The minimum TLS cipher grade that the Postfix SMTP server
  will use with opportunistic TLS encryption. Cipher types listed in
  smtpd_tls_exclude_ciphers are excluded from the base definition of
! the selected cipher grade.  The default value is "medium" for Postfix
! releases after the middle of 2015, "export" for older releases.
! </p>
  
  <p> When TLS is mandatory the cipher grade is chosen via the
  smtpd_tls_mandatory_ciphers configuration parameter, see there for syntax
  details. </p>
  
  <p> This feature is available in Postfix 2.6 and later. With earlier Postfix
  releases only the smtpd_tls_mandatory_ciphers parameter is implemented,
  and opportunistic TLS always uses "export" or better (i.e. all) ciphers. </p>
  
! %PARAM lmtp_tls_ciphers medium
  
  <p> The LMTP-specific version of the smtp_tls_ciphers configuration
  parameter. See there for details. </p>
diff -cr --new-file /var/tmp/postfix-2.10.7/src/global/mail_params.h ./src/global/mail_params.h
*** /var/tmp/postfix-2.10.7/src/global/mail_params.h	2013-06-22 19:57:19.000000000 -0400
--- ./src/global/mail_params.h	2015-07-19 19:20:38.000000000 -0400
***************
*** 1253,1267 ****
  extern char *var_smtpd_tls_CApath;
  
  #define VAR_SMTPD_TLS_PROTO		"smtpd_tls_protocols"
! #define DEF_SMTPD_TLS_PROTO		""
  extern char *var_smtpd_tls_proto;
  
  #define VAR_SMTPD_TLS_MAND_PROTO	"smtpd_tls_mandatory_protocols"
! #define DEF_SMTPD_TLS_MAND_PROTO	"!SSLv2"
  extern char *var_smtpd_tls_mand_proto;
  
  #define VAR_SMTPD_TLS_CIPH	"smtpd_tls_ciphers"
! #define DEF_SMTPD_TLS_CIPH	"export"
  extern char *var_smtpd_tls_ciph;
  
  #define VAR_SMTPD_TLS_MAND_CIPH	"smtpd_tls_mandatory_ciphers"
--- 1253,1267 ----
  extern char *var_smtpd_tls_CApath;
  
  #define VAR_SMTPD_TLS_PROTO		"smtpd_tls_protocols"
! #define DEF_SMTPD_TLS_PROTO		"!SSLv2, !SSLv3"
  extern char *var_smtpd_tls_proto;
  
  #define VAR_SMTPD_TLS_MAND_PROTO	"smtpd_tls_mandatory_protocols"
! #define DEF_SMTPD_TLS_MAND_PROTO	"!SSLv2, !SSLv3"
  extern char *var_smtpd_tls_mand_proto;
  
  #define VAR_SMTPD_TLS_CIPH	"smtpd_tls_ciphers"
! #define DEF_SMTPD_TLS_CIPH	"medium"
  extern char *var_smtpd_tls_ciph;
  
  #define VAR_SMTPD_TLS_MAND_CIPH	"smtpd_tls_mandatory_ciphers"
***************
*** 1401,1409 ****
  extern char *var_smtp_tls_CApath;
  
  #define VAR_SMTP_TLS_CIPH	"smtp_tls_ciphers"
! #define DEF_SMTP_TLS_CIPH	"export"
  #define VAR_LMTP_TLS_CIPH	"lmtp_tls_ciphers"
! #define DEF_LMTP_TLS_CIPH	"export"
  extern char *var_smtp_tls_ciph;
  
  #define VAR_SMTP_TLS_MAND_CIPH	"smtp_tls_mandatory_ciphers"
--- 1401,1409 ----
  extern char *var_smtp_tls_CApath;
  
  #define VAR_SMTP_TLS_CIPH	"smtp_tls_ciphers"
! #define DEF_SMTP_TLS_CIPH	"medium"
  #define VAR_LMTP_TLS_CIPH	"lmtp_tls_ciphers"
! #define DEF_LMTP_TLS_CIPH	"medium"
  extern char *var_smtp_tls_ciph;
  
  #define VAR_SMTP_TLS_MAND_CIPH	"smtp_tls_mandatory_ciphers"
***************
*** 1464,1478 ****
  extern char *var_smtp_tls_policy;
  
  #define VAR_SMTP_TLS_PROTO	"smtp_tls_protocols"
! #define DEF_SMTP_TLS_PROTO	"!SSLv2"
  #define VAR_LMTP_TLS_PROTO	"lmtp_tls_protocols"
! #define DEF_LMTP_TLS_PROTO	"!SSLv2"
  extern char *var_smtp_tls_proto;
  
  #define VAR_SMTP_TLS_MAND_PROTO	"smtp_tls_mandatory_protocols"
! #define DEF_SMTP_TLS_MAND_PROTO	"!SSLv2"
  #define VAR_LMTP_TLS_MAND_PROTO	"lmtp_tls_mandatory_protocols"
! #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"
--- 1464,1478 ----
  extern char *var_smtp_tls_policy;
  
  #define VAR_SMTP_TLS_PROTO	"smtp_tls_protocols"
! #define DEF_SMTP_TLS_PROTO	"!SSLv2, !SSLv3"
  #define VAR_LMTP_TLS_PROTO	"lmtp_tls_protocols"
! #define DEF_LMTP_TLS_PROTO	"!SSLv2, !SSLv3"
  extern char *var_smtp_tls_proto;
  
  #define VAR_SMTP_TLS_MAND_PROTO	"smtp_tls_mandatory_protocols"
! #define DEF_SMTP_TLS_MAND_PROTO	"!SSLv2, !SSLv3"
  #define VAR_LMTP_TLS_MAND_PROTO	"lmtp_tls_mandatory_protocols"
! #define DEF_LMTP_TLS_MAND_PROTO	"!SSLv2, !SSLv3"
  extern char *var_smtp_tls_mand_proto;
  
  #define VAR_SMTP_TLS_VFY_CMATCH	"smtp_tls_verify_cert_match"
diff -cr --new-file /var/tmp/postfix-2.10.7/src/smtp/smtp.c ./src/smtp/smtp.c
*** /var/tmp/postfix-2.10.7/src/smtp/smtp.c	2012-07-17 15:40:55.000000000 -0400
--- ./src/smtp/smtp.c	2015-07-19 19:33:44.009468000 -0400
***************
*** 369,375 ****
  /*	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 (!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"
--- 369,375 ----
  /*	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 (!SSLv2, !SSLv3)\fR"
  /*	List of SSL/TLS protocols that the Postfix SMTP client will use with
  /*	mandatory TLS encryption.
  /* .IP "\fBsmtp_tls_scert_verifydepth (9)\fR"
***************
*** 420,429 ****
  /*	certificate fingerprints.
  /* .PP
  /*	Available in Postfix version 2.6 and later:
! /* .IP "\fBsmtp_tls_protocols (!SSLv2)\fR"
  /*	List of TLS protocols that the Postfix SMTP client will exclude or
  /*	include with opportunistic TLS encryption.
! /* .IP "\fBsmtp_tls_ciphers (export)\fR"
  /*	The minimum TLS cipher grade that the Postfix SMTP client
  /*	will use with opportunistic TLS encryption.
  /* .IP "\fBsmtp_tls_eccert_file (empty)\fR"
--- 420,429 ----
  /*	certificate fingerprints.
  /* .PP
  /*	Available in Postfix version 2.6 and later:
! /* .IP "\fBsmtp_tls_protocols (!SSLv2, !SSLv3)\fR"
  /*	List of TLS protocols that the Postfix SMTP client will exclude or
  /*	include with opportunistic TLS encryption.
! /* .IP "\fBsmtp_tls_ciphers (medium)\fR"
  /*	The minimum TLS cipher grade that the Postfix SMTP client
  /*	will use with opportunistic TLS encryption.
  /* .IP "\fBsmtp_tls_eccert_file (empty)\fR"
diff -cr --new-file /var/tmp/postfix-2.10.7/src/smtpd/smtpd.c ./src/smtpd/smtpd.c
*** /var/tmp/postfix-2.10.7/src/smtpd/smtpd.c	2014-10-18 17:40:07.000000000 -0400
--- ./src/smtpd/smtpd.c	2015-07-19 19:46:47.000000000 -0400
***************
*** 378,384 ****
  /* .IP "\fBsmtpd_tls_mandatory_exclude_ciphers (empty)\fR"
  /*	Additional list of ciphers or cipher types to exclude from the
  /*	Postfix SMTP server cipher list at mandatory TLS security levels.
! /* .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"
--- 378,384 ----
  /* .IP "\fBsmtpd_tls_mandatory_exclude_ciphers (empty)\fR"
  /*	Additional list of ciphers or cipher types to exclude from the
  /*	Postfix SMTP server cipher list at mandatory TLS security levels.
! /* .IP "\fBsmtpd_tls_mandatory_protocols (!SSLv2, !SSLv3)\fR"
  /*	The SSL/TLS protocols accepted by the Postfix SMTP server with
  /*	mandatory TLS encryption.
  /* .IP "\fBsmtpd_tls_received_header (no)\fR"
***************
*** 422,431 ****
  /*	for \fBcheck_ccert_access\fR and \fBpermit_tls_clientcerts\fR.
  /* .PP
  /*	Available in Postfix version 2.6 and later:
! /* .IP "\fBsmtpd_tls_protocols (empty)\fR"
  /*	List of TLS protocols that the Postfix SMTP server will exclude
  /*	or include with opportunistic TLS encryption.
! /* .IP "\fBsmtpd_tls_ciphers (export)\fR"
  /*	The minimum TLS cipher grade that the Postfix SMTP server
  /*	will use with opportunistic TLS encryption.
  /* .IP "\fBsmtpd_tls_eccert_file (empty)\fR"
--- 422,431 ----
  /*	for \fBcheck_ccert_access\fR and \fBpermit_tls_clientcerts\fR.
  /* .PP
  /*	Available in Postfix version 2.6 and later:
! /* .IP "\fBsmtpd_tls_protocols (!SSLv2, !SSLv3)\fR"
  /*	List of TLS protocols that the Postfix SMTP server will exclude
  /*	or include with opportunistic TLS encryption.
! /* .IP "\fBsmtpd_tls_ciphers (medium)\fR"
  /*	The minimum TLS cipher grade that the Postfix SMTP server
  /*	will use with opportunistic TLS encryption.
  /* .IP "\fBsmtpd_tls_eccert_file (empty)\fR"
diff -cr --new-file /var/tmp/postfix-2.10.7/src/util/sys_defs.h ./src/util/sys_defs.h
*** /var/tmp/postfix-2.10.7/src/util/sys_defs.h	2015-04-09 08:26:35.000000000 -0400
--- ./src/util/sys_defs.h	2015-07-19 09:53:14.000000000 -0400
***************
*** 740,746 ****
   /*
    * LINUX.
    */
! #if defined(LINUX2) || defined(LINUX3)
  #define SUPPORTED
  #include <sys/types.h>
  #define UINT32_TYPE	unsigned int
--- 740,746 ----
   /*
    * LINUX.
    */
! #if defined(LINUX2) || defined(LINUX3) || defined(LINUX4)
  #define SUPPORTED
  #include <sys/types.h>
  #define UINT32_TYPE	unsigned int