postfix-2.4-20070125

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 5ba0c825377b8ca60b3d1c3a537e038d1c399bfb..5c077de5dd94f4026aba2c4bdea5f737311d59b4 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13155,6 +13155,11 @@ Apologies for any names omitted.
        is present when only AES128 is available.  Code by Victor
        Duchovni.  File: tls/tls_misc.c.
 
+20070125
+
+       Disable workaround pending completion of updated TLS]
+       support in non-production releases.
+
 Wish list:
 
        Update message content length when adding/removing headers.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index cce3395d8e37dc77078f3872e90dced6307de070..b53bb3d17f74dd96526b31d6a6972a6839f662ad 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20070123"
+#define MAIL_RELEASE_DATE      "20070125"
 #define MAIL_VERSION_NUMBER    "2.4"
 
 #ifdef SNAPSHOT

diff --git a/postfix/src/tls/tls_misc.c b/postfix/src/tls/tls_misc.c
index ac5f255074e000a9497e51ac309c0c7d4e89565e..3030ca18135fa14971c7987d6eea6efde2cb4f97 100644 (file)
--- a/postfix/src/tls/tls_misc.c
+++ b/postfix/src/tls/tls_misc.c
@@ -244,6 +244,7 @@ const char *tls_cipher_list(int cipher_level,...)
     /*
      * Exclude ciphers that clueless distributions leave out of libcrypto.
      */
+#if 0
     if (exclude_unavailable == 0) {
        exclude_unavailable = argv_alloc(1);
        for (probe = cipher_probe_list; probe->algorithm; ++probe)
@@ -252,6 +253,7 @@ const char *tls_cipher_list(int cipher_level,...)
     }
     for (i = 0; i < exclude_unavailable->argc; ++i)
        vstring_sprintf_append(buf, ":!%s", exclude_unavailable->argv[i]);
+#endif
 
     va_start(ap, cipher_level);
     while ((exclude = va_arg(ap, char *)) != 0) {