adium/adium

Merged adium-1.6 into default.

2013-06-25, Thijs Alkemade
551c610ece99
Parents ac2d267c77af8dd676d7398d
Children 51f0fe2d35a2b208c06fd43a
Merged adium-1.6 into default.
1 files changed, 0 insertions(+), 45 deletions(-)
  • +0 -45
    Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c
    • --- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Sat Jun 22 00:40:15 2013 -0400
    +++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Tue Jun 25 10:04:55 2013 +0200
    @@ -361,51 +361,6 @@
    return;
    }
    - /*
    - * Disable ciphers that confuse some servers
    - */
    - SSLCipherSuite ciphers[28] = {
    - TLS_RSA_WITH_AES_128_CBC_SHA,
    - SSL_RSA_WITH_RC4_128_SHA,
    - SSL_RSA_WITH_RC4_128_MD5,
    - TLS_RSA_WITH_AES_256_CBC_SHA,
    - SSL_RSA_WITH_3DES_EDE_CBC_SHA,
    - SSL_RSA_WITH_3DES_EDE_CBC_MD5,
    - SSL_RSA_WITH_DES_CBC_SHA,
    - SSL_RSA_EXPORT_WITH_RC4_40_MD5,
    - SSL_RSA_EXPORT_WITH_DES40_CBC_SHA,
    - SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5,
    - TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
    - TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
    - TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
    - TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
    - SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
    - SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA,
    - SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
    - SSL_DHE_DSS_WITH_DES_CBC_SHA,
    - SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA,
    - TLS_DH_anon_WITH_AES_128_CBC_SHA,
    - TLS_DH_anon_WITH_AES_256_CBC_SHA,
    - SSL_DH_anon_WITH_RC4_128_MD5,
    - SSL_DH_anon_WITH_3DES_EDE_CBC_SHA,
    - SSL_DH_anon_WITH_DES_CBC_SHA,
    - SSL_DH_anon_EXPORT_WITH_RC4_40_MD5,
    - SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA,
    - SSL_RSA_WITH_NULL_MD5,
    - SSL_NO_SUCH_CIPHERSUITE
    - };
    -
    - err = ssl_cdsa_set_enabled_ciphers(cdsa_data->ssl_ctx, ciphers);
    - if (err != noErr) {
    - purple_debug_error("cdsa", "SSLSetEnabledCiphers failed\n");
    - if (gsc->error_cb != NULL)
    - gsc->error_cb(gsc, PURPLE_SSL_HANDSHAKE_FAILED,
    - gsc->connect_cb_data);
    -
    - purple_ssl_close(gsc);
    - return;
    - }
    -
    if (purple_account_get_bool(account, PURPLE_SSL_CDSA_BUGGY_TLS_WORKAROUND, false)) {
    purple_debug_info("cdsa", "Explicitly disabling TLS 1.1 and above to try and work around buggy TLS stacks\n");