wok-next view partimage/stuff/patches/use-SSLv3-by-default.patch @ rev 20889
Check Repology info from y* to z* packages: complete
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sun Jul 15 10:27:39 2018 +0300 (2018-07-15) |
| parents | |
| children |
line source
1 From 8b05af027723ff3a64040275d4050ff0e992d629 Mon Sep 17 00:00:00 2001
2 From: Marko Kohtala <marko.kohtala@gmail.com>
3 Date: Sun, 9 Feb 2014 22:54:11 +0200
4 Subject: [PATCH] Use SSLv3 by default
6 SSLv2_client_method may be hidden. Use the SSLv23_client_method instead.
8 This is a fix from Debian package partimage-0.6.8-2.2.
10 Signed-off-by: Marko Kohtala <marko.kohtala@gmail.com>
11 ---
12 src/client/netclient.cpp | 3 +--
13 src/client/netclient.h | 6 ------
14 src/server/netserver.cpp | 3 +--
15 src/server/netserver.h | 6 ------
16 4 files changed, 2 insertions(+), 16 deletions(-)
18 diff --git a/src/client/netclient.cpp b/src/client/netclient.cpp
19 index 30b8d5c..43b2672 100644
20 --- a/src/client/netclient.cpp
21 +++ b/src/client/netclient.cpp
22 @@ -43,9 +43,8 @@ CNetClient::CNetClient(bool bMustLogin, bool bUseSSL):CNet()
23 {
24 showDebug(3, "initializing client ssl\n");
25 SSLeay_add_ssl_algorithms();
26 - meth = SSLv2_client_method();
27 SSL_load_error_strings();
28 - ctx = SSL_CTX_new(meth);
29 + ctx = SSL_CTX_new(SSLv23_client_method());
30 if (!ctx)
31 THROW(ERR_SSL_CTX);
32 m_bUseSSL = (ctx != NULL);
33 diff --git a/src/client/netclient.h b/src/client/netclient.h
34 index 8423798..9d98b39 100644
35 --- a/src/client/netclient.h
36 +++ b/src/client/netclient.h
37 @@ -35,12 +35,6 @@ class CNetClient : public CNet
38 #ifdef HAVE_SSL
39 SSL_CTX * ctx;
40 X509 * server_cert;
41 -#if OPENSSL_VERSION_NUMBER >= 0x10000000L
42 - SSL_METHOD const * meth;
43 -#else
44 - SSL_METHOD * meth;
45 -#endif // OPENSSL_VERSION_NUMBER
46 -
47 #endif
48 bool m_bUseSSL;
49 bool m_bMustLogin;
50 diff --git a/src/server/netserver.cpp b/src/server/netserver.cpp
51 index a542760..28c43cc 100644
52 --- a/src/server/netserver.cpp
53 +++ b/src/server/netserver.cpp
54 @@ -39,8 +39,7 @@ CNetServer::CNetServer( uint32_t ip4_addr, unsigned short int port):CNet()
55 {
56 SSL_load_error_strings();
57 SSLeay_add_ssl_algorithms();
58 - meth = SSLv23_server_method();
59 - ctx = SSL_CTX_new(meth);
60 + ctx = SSL_CTX_new(SSLv23_server_method());
61 if (!ctx)
62 {
63 ERR_print_errors_fp(stderr);
64 diff --git a/src/server/netserver.h b/src/server/netserver.h
65 index 01f6b6c..29d2a32 100644
66 --- a/src/server/netserver.h
67 +++ b/src/server/netserver.h
68 @@ -41,12 +41,6 @@ class CNetServer : public CNet
69 #ifdef HAVE_SSL
70 SSL_CTX * ctx;
71 X509 * client_cert;
72 -#if OPENSSL_VERSION_NUMBER >= 0x10000000L
73 - SSL_METHOD const * meth;
74 -#else
75 - SSL_METHOD * meth;
76 -#endif // OPENSSL_VERSION_NUMBER
77 -
78 int err;
79 #endif