1 files changed, 6 insertions, 5 deletions

diff --git a/vchat-ssl.c b/vchat-ssl.c
index 2b41432..64886ca 100755
--- a/vchat-ssl.c
+++ b/vchat-ssl.c
@@ -61,8 +61,7 @@ SSL_CTX * vc_create_sslctx( vc_x509store_t *vc_store )
    X509_STORE           *store            = NULL;
    vc_x509verify_cb_t   verify_callback   = NULL;
 
-   /* Explicitly use TLSv1_2 (or maybe later) */
-   if( !(ctx = SSL_CTX_new(TLSv1_2_client_method())) )
+   if( !(ctx = SSL_CTX_new(SSLv23_method())) )
       VC_CTX_ERR_EXIT(store, ctx);
 
    if( !(store = vc_x509store_create(vc_store)) )
@@ -70,9 +69,11 @@ SSL_CTX * vc_create_sslctx( vc_x509store_t *vc_store )
 
    SSL_CTX_set_cert_store(ctx, store);
    store = NULL;
-   /* Disable A LOT of insecure protocols explicitly */
-   SSL_CTX_set_options(ctx, SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1);
-   SSL_CTX_set_cipher_list(ctx, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
+   SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+   if( OPENSSL_VERSION_NUMBER < 0x10000000L )
+     SSL_CTX_set_cipher_list(ctx, "DHE-RSA-AES256-SHA");
+   else
+     SSL_CTX_set_cipher_list(ctx, "ECDHE-RSA-AES256-GCM-SHA384");
 
    SSL_CTX_set_verify_depth (ctx, 2);