[sr-dev] git:5.0:071b85f6: tls: explicit libssl v1.1+ cleanup when module is destroyed
Daniel-Constantin Mierla
miconda at gmail.com
Wed Aug 2 10:03:08 CEST 2017
Module: kamailio
Branch: 5.0
Commit: 071b85f66cabaa3a705a014b26b7c1eb31029b26
URL: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1eb31029b26
Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2017-08-02T10:02:45+02:00
tls: explicit libssl v1.1+ cleanup when module is destroyed
- OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls
module is destroyed, to avoid being executed again on final exit
(due to atexit() callback), because at that moment shared memory
is already destroyed and attempts to access the locals will result
in cored dump
- retported by Victor Seva, GH #1189
(cherry picked from commit 00eb71da83347c9d2ea74feacec9c955f7b2a2e6)
---
Modified: src/modules/tls/tls_init.c
---
Diff: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1eb31029b26.diff
Patch: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1eb31029b26.patch
---
diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c
index 5d977fc810..b12209a0cd 100644
--- a/src/modules/tls/tls_init.c
+++ b/src/modules/tls/tls_init.c
@@ -778,4 +778,10 @@ void destroy_tls_h(void)
tls_destroy_cfg();
tls_destroy_locks();
tls_ct_wq_destroy();
+#if OPENSSL_VERSION_NUMBER >= 0x010100000L
+ /* explicit execution of libssl cleanup to avoid being executed again
+ * by atexit(), when shm is gone */
+ DBG("executing openssl v1.1+ cleanup\n");
+ OPENSSL_cleanup();
+#endif
}
More information about the sr-dev
mailing list