mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-21 20:14:44 +00:00
Merge pull request #3188 from thentenaar/clean-up-after-openssl
global: Ensure we free our SSL context.
This commit is contained in:
commit
c0d7999263
16
src/global.c
16
src/global.c
@ -116,6 +116,20 @@ static void init_ssl(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This function aims to clean-up the SSL context which
|
||||||
|
* we allocated.
|
||||||
|
*/
|
||||||
|
static void uninit_ssl(void)
|
||||||
|
{
|
||||||
|
#ifdef GIT_OPENSSL
|
||||||
|
if (git__ssl_ctx) {
|
||||||
|
SSL_CTX_free(git__ssl_ctx);
|
||||||
|
git__ssl_ctx = NULL;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
int git_openssl_set_locking(void)
|
int git_openssl_set_locking(void)
|
||||||
{
|
{
|
||||||
#ifdef GIT_OPENSSL
|
#ifdef GIT_OPENSSL
|
||||||
@ -333,6 +347,7 @@ int git_libgit2_shutdown(void)
|
|||||||
|
|
||||||
/* Shut down any subsystems that have global state */
|
/* Shut down any subsystems that have global state */
|
||||||
git__shutdown();
|
git__shutdown();
|
||||||
|
uninit_ssl();
|
||||||
|
|
||||||
ptr = pthread_getspecific(_tls_key);
|
ptr = pthread_getspecific(_tls_key);
|
||||||
pthread_setspecific(_tls_key, NULL);
|
pthread_setspecific(_tls_key, NULL);
|
||||||
@ -391,6 +406,7 @@ int git_libgit2_shutdown(void)
|
|||||||
|
|
||||||
git__shutdown();
|
git__shutdown();
|
||||||
git__global_state_cleanup(&__state);
|
git__global_state_cleanup(&__state);
|
||||||
|
uninit_ssl();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user