pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-06 21:12:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reds: Fix compilation without deprecated OpenSSL 1.1 APIs

Browse Source 
Missing headers for BN_ and RSA_ functions.

Initialization is deprecated with 1.1.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Rosen Penev 2019-11-03 15:34:33 -08:00 committed by Frediano Ziglio
parent b5c296056e
commit 5bc932f7a7
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -74,5 +74,6 @@ Patches also contributed by
Thiago Mendes <tribeirom@gmail.com>
Christian Ehrhardt <christian.ehrhardt@canonical.com>
Kevin Pouget <kpouget@redhat.com>
Rosen Penev <rosenp@gmail.com>
....send patches to get your name here...

24
server/reds.c
View File

@ -36,7 +36,9 @@
#include <ws2tcpip.h>
#endif
#include <openssl/bn.h>
#include <openssl/err.h>
#include <openssl/rsa.h>
#if HAVE_SASL
#include <sasl/sasl.h>
@ -2838,13 +2840,8 @@ static void openssl_thread_setup(void)
CRYPTO_set_id_callback(pthreads_thread_id);
CRYPTO_set_locking_callback(pthreads_locking_callback);
}
#else
static inline void openssl_thread_setup(void)
{
}
#endif
static gpointer openssl_global_init(gpointer arg)
static gpointer openssl_global_init_once(gpointer arg)
{
SSL_library_init();
SSL_load_error_strings();
@ -2854,9 +2851,20 @@ static gpointer openssl_global_init(gpointer arg)
return NULL;
}
static int reds_init_ssl(RedsState *reds)
static inline void openssl_global_init(void)
{
static GOnce openssl_once = G_ONCE_INIT;
g_once(&openssl_once, openssl_global_init_once, NULL);
}
#else
static inline void openssl_global_init(void)
{
}
#endif
static int reds_init_ssl(RedsState *reds)
{
const SSL_METHOD *ssl_method;
int return_code;
/* Limit connection to TLSv1.1 or newer.
@ -2865,7 +2873,7 @@ static int reds_init_ssl(RedsState *reds)
long ssl_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION | SSL_OP_NO_TLSv1;
/* Global system initialization*/
g_once(&openssl_once, openssl_global_init, NULL);
openssl_global_init();
/* Create our context*/
/* SSLv23_method() handles TLSv1.x in addition to SSLv2/v3 */