proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 22:21:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ssl: use locking

Browse Source 
When using in a multithreaded context, OpenSSL needs to lock, and leaves
it up to application to provide said locks.

We were not doing this, and it's just luck that's kept us from crashing
up to now.
This commit is contained in:
Carlos Martín Nieto 2014-06-11 23:19:48 +02:00
parent 1d3364ac9d
commit 5fa0494328
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/netops.c
View File

@ -35,6 +35,11 @@
#include "http_parser.h" #include "http_parser.h"
#include "global.h" #include "global.h"
#if defined(GIT_SSL) && defined(GIT_THREADS)
/* OpenSSL wants us to keep an array of locks */
static git_mutex *openssl_locks;
#endif
#ifdef GIT_WIN32 #ifdef GIT_WIN32
static void net_set_error(const char *str) static void net_set_error(const char *str)
{ {
@ -387,6 +392,24 @@ cert_fail_name:
return -1; return -1;
} }
#ifdef GIT_THREADS
void openssl_locking_function(int mode, int n, const char *file, int line)
{
int lock;
GIT_UNUSED(file);
GIT_UNUSED(line);
lock = mode & CRYPTO_LOCK;
if (lock) {
git_mutex_lock(&openssl_locks[n]);
} else {
git_mutex_unlock(&openssl_locks[n]);
}
}
#endif
/** /**
* The OpenSSL init functions are not reentrant so we need to init * The OpenSSL init functions are not reentrant so we need to init
* them under lock. * them under lock.
@ -409,6 +432,25 @@ static int init_ssl(void)
SSL_library_init(); SSL_library_init();
SSL_load_error_strings(); SSL_load_error_strings();
#ifdef GIT_THREADS
{
int num_locks, i;
CRYPTO_set_locking_callback(openssl_locking_function);
num_locks = CRYPTO_num_locks();
openssl_locks = git__calloc(num_locks, sizeof(git_mutex));
for (i = 0; i < num_locks; i++) {
if (git_mutex_init(&openssl_locks[i]) < 0) {
git_mutex_unlock(&git__ssl_mutex);
giterr_set(GITERR_SSL, "failed to init lock %d", i);
return -1;
}
}
}
#endif
git_atomic_set(&git__ssl_init, 1); git_atomic_set(&git__ssl_init, 1);
git_mutex_unlock(&git__ssl_mutex); git_mutex_unlock(&git__ssl_mutex);