sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-07 00:01:49 -04:00
Code Issues Projects Releases Wiki Activity

openssl: Don't use deprecated CRYPTO_set_id_callback() with OpenSSL >= 1.0.0

Browse Source
This commit is contained in:
Tobias Brunner 2013-04-17 13:00:51 +02:00
parent 780900ab0e
commit 3ee2af97bf
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/libstrongswan/plugins/openssl/openssl_plugin.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2008 Tobias Brunner * Copyright (C) 2008-2013 Tobias Brunner
* Copyright (C) 2008 Martin Willi * Copyright (C) 2008 Martin Willi
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
* *
@ -142,6 +142,13 @@ static unsigned long id_function(void)
return 1 + (unsigned long)thread_current_id(); return 1 + (unsigned long)thread_current_id();
} }
#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
static void threadid_function(CRYPTO_THREADID *threadid)
{
CRYPTO_THREADID_set_numeric(threadid, id_function());
}
#endif /* OPENSSL_VERSION_NUMBER */
/** /**
* initialize OpenSSL for multi-threaded use * initialize OpenSSL for multi-threaded use
*/ */
@ -149,7 +156,12 @@ static void threading_init()
{ {
int i, num_locks; int i, num_locks;
#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
CRYPTO_THREADID_set_callback(threadid_function);
#else
CRYPTO_set_id_callback(id_function); CRYPTO_set_id_callback(id_function);
#endif
CRYPTO_set_locking_callback(locking_function); CRYPTO_set_locking_callback(locking_function);
CRYPTO_set_dynlock_create_callback(create_function); CRYPTO_set_dynlock_create_callback(create_function);
@ -164,6 +176,22 @@ static void threading_init()
} }
} }
/**
* cleanup OpenSSL threading locks
*/
static void threading_cleanup()
{
int i, num_locks;
num_locks = CRYPTO_num_locks();
for (i = 0; i < num_locks; i++)
{
mutex[i]->destroy(mutex[i]);
}
free(mutex);
mutex = NULL;
}
/** /**
* Seed the OpenSSL RNG, if required * Seed the OpenSSL RNG, if required
*/ */
@ -193,22 +221,6 @@ static bool seed_rng()
return TRUE; return TRUE;
} }
/**
* cleanup OpenSSL threading locks
*/
static void threading_cleanup()
{
int i, num_locks;
num_locks = CRYPTO_num_locks();
for (i = 0; i < num_locks; i++)
{
mutex[i]->destroy(mutex[i]);
}
free(mutex);
mutex = NULL;
}
METHOD(plugin_t, get_name, char*, METHOD(plugin_t, get_name, char*,
private_openssl_plugin_t *this) private_openssl_plugin_t *this)
{ {