|
 |
8fa6cd |
From 527eb322a5bfa97d5716e7f8178e319c515065a2 Mon Sep 17 00:00:00 2001
|
|
|
8fa6cd |
From: Marc Deslauriers <marc.deslauriers@ubuntu.com>
|
|
|
8fa6cd |
Date: Mon, 20 Oct 2014 10:08:26 -0400
|
|
|
8fa6cd |
Subject: [PATCH] Don't force the use of SSLv3.
|
|
|
8fa6cd |
|
|
|
8fa6cd |
SSLv3 should no longer be used for security reasons. Let the best
|
|
|
8fa6cd |
connection method be automatically determined by using SSLv23_client_method()
|
|
|
8fa6cd |
and SSLv23_server_method().
|
|
|
8fa6cd |
---
|
|
|
8fa6cd |
src/common/ssl.c | 4 ++--
|
|
|
8fa6cd |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
8fa6cd |
|
|
|
8fa6cd |
diff --git a/src/common/ssl.c b/src/common/ssl.c
|
|
|
8fa6cd |
index a18ad47..35eb237 100644
|
|
|
8fa6cd |
--- a/src/common/ssl.c
|
|
|
8fa6cd |
+++ b/src/common/ssl.c
|
|
|
8fa6cd |
@@ -70,7 +70,7 @@ _SSL_context_init (void (*info_cb_func), int server)
|
|
|
8fa6cd |
|
|
|
8fa6cd |
SSLeay_add_ssl_algorithms ();
|
|
|
8fa6cd |
SSL_load_error_strings ();
|
|
|
8fa6cd |
- ctx = SSL_CTX_new (server ? SSLv3_server_method() : SSLv3_client_method ());
|
|
|
8fa6cd |
+ ctx = SSL_CTX_new (server ? SSLv23_server_method() : SSLv23_client_method ());
|
|
|
8fa6cd |
|
|
|
8fa6cd |
SSL_CTX_set_session_cache_mode (ctx, SSL_SESS_CACHE_BOTH);
|
|
|
8fa6cd |
SSL_CTX_set_timeout (ctx, 300);
|
|
|
8fa6cd |
@@ -281,7 +281,7 @@ _SSL_socket (SSL_CTX *ctx, int sd)
|
|
|
8fa6cd |
__SSL_critical_error ("SSL_new");
|
|
|
8fa6cd |
|
|
|
8fa6cd |
SSL_set_fd (ssl, sd);
|
|
|
8fa6cd |
- if (ctx->method == SSLv3_client_method())
|
|
|
8fa6cd |
+ if (ctx->method == SSLv23_client_method())
|
|
|
8fa6cd |
SSL_set_connect_state (ssl);
|
|
|
8fa6cd |
else
|
|
|
8fa6cd |
SSL_set_accept_state(ssl);
|
|
|
8fa6cd |
--
|
|
|
8fa6cd |
2.1.0
|
|
|
8fa6cd |
|