← Back to branch summary

~ubuntu-branches/ubuntu/saucy/postfix/saucy

« back to all changes in this revision

Viewing changes to src/global/mail_params.h

  • Committer: Bazaar Package Importer
  • Author(s): LaMont Jones, Wietse Venema
  • Date: 2011-03-22 10:37:24 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20110322103724-k0v7crojhfxn8i61
Tags: 2.8.2-1
[Wietse Venema]

new upstream, various bug fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/global/mail_params.h
2987
2987
#define DEF_TLS_PREEMPT_CLIST   0
2988
2988
extern bool var_tls_preempt_clist;
2989
2989
 
2990
 
#ifdef USE_TLS
2991
 
 
2992
 
 /*
2993
 
  * The tweak for CVE-2005-2969 is needed in some versions prior to 1.0.0
2994
 
  */
 
2990
 /* The tweak for CVE-2010-4180 is needed in some versions prior to 1.0.1 */
 
2991
 /* The tweak for CVE-2005-2969 is needed in some versions prior to 1.0.0 */
 
2992
#if defined(USE_TLS) && (OPENSSL_VERSION_NUMBER < 0x1000100fL)
2995
2993
#if (OPENSSL_VERSION_NUMBER < 0x1000000fL)
2996
 
#define TLS_BUG_TWEAK_A " CVE-2005-2969"
2997
 
#else
2998
 
#define TLS_BUG_TWEAK_A ""
2999
 
#endif
3000
 
 
3001
 
 /*
3002
 
  * The tweak for CVE-2010-4180 is needed in some versions prior to 1.0.1
3003
 
  */
3004
 
#if (OPENSSL_VERSION_NUMBER < 0x1000100fL)
3005
 
#define TLS_BUG_TWEAK_B " CVE-2010-4180"
3006
 
#else
3007
 
#define TLS_BUG_TWEAK_B " "
3008
 
#endif
3009
 
 
3010
 
#else /* USE_TLS */
3011
 
#define TLS_BUG_TWEAK_A ""
3012
 
#define TLS_BUG_TWEAK_B " "
3013
 
#endif /* USE_TLS */
 
2994
#define TLS_BUG_TWEAKS          "CVE-2005-2969 CVE-2010-4180"
 
2995
#else
 
2996
#define TLS_BUG_TWEAKS          "CVE-2010-4180"
 
2997
#endif
 
2998
#else
 
2999
#define TLS_BUG_TWEAKS          ""
 
3000
#endif
3014
3001
 
3015
3002
#define VAR_TLS_BUG_TWEAKS      "tls_disable_workarounds"
3016
 
#define DEF_TLS_BUG_TWEAKS      ((TLS_BUG_TWEAK_A TLS_BUG_TWEAK_B)+1)
 
3003
#define DEF_TLS_BUG_TWEAKS      TLS_BUG_TWEAKS
3017
3004
extern char *var_tls_bug_tweaks;
3018
3005
 
3019
3006
 /*