sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
313 discussions

git:master:d05191ae: cmake: removed print and print_lib modules

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d05191aeb9b5ca97e43ca9af421d3f17e1783f08 URL: https://github.com/kamailio/kamailio/commit/d05191aeb9b5ca97e43ca9af421d3f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T17:20:55+01:00 cmake: removed print and print_lib modules --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/d05191aeb9b5ca97e43ca9af421d3f1… Patch: https://github.com/kamailio/kamailio/commit/d05191aeb9b5ca97e43ca9af421d3f1… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 491d8dbbf30..383368b7ae8 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -149,7 +149,7 @@ set(MOD_LIST_DBUID db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags ) # * modules for devel purposes -set(MOD_LIST_DEVEL misctest print print_lib) +set(MOD_LIST_DEVEL misctest) # * modules depending on pcre3 library set(MOD_LIST_PCRE dialplan lcr regex)

2 weeks, 4 days

git:master:6be7b703: Makefile.groups: removed sample print modules

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6be7b7038f6ce88eb5512e2f03c5b712f27affb1 URL: https://github.com/kamailio/kamailio/commit/6be7b7038f6ce88eb5512e2f03c5b71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T17:07:52+01:00 Makefile.groups: removed sample print modules --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/6be7b7038f6ce88eb5512e2f03c5b71… Patch: https://github.com/kamailio/kamailio/commit/6be7b7038f6ce88eb5512e2f03c5b71… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 83c4bdb2a47..7cc87588272 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -38,7 +38,7 @@ mod_list_dbuid=db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ uid_uri_db # - modules for devel purposes -mod_list_devel=misctest print print_lib +mod_list_devel=misctest # - modules depending on pcre3 library mod_list_pcre=dialplan lcr regex

2 weeks, 4 days

git:master:1f3828ef: print: relocated to archive

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1f3828efdb653e4af15a3ac486f5cfab6a9b0ce6 URL: https://github.com/kamailio/kamailio/commit/1f3828efdb653e4af15a3ac486f5cfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T17:06:14+01:00 print: relocated to archive --- Removed: src/modules/print/CMakeLists.txt Removed: src/modules/print/Makefile Removed: src/modules/print/README Removed: src/modules/print/doc/Makefile Removed: src/modules/print/doc/functions.xml Removed: src/modules/print/doc/params.xml Removed: src/modules/print/doc/print.xml Removed: src/modules/print/print.c --- Diff: https://github.com/kamailio/kamailio/commit/1f3828efdb653e4af15a3ac486f5cfa… Patch: https://github.com/kamailio/kamailio/commit/1f3828efdb653e4af15a3ac486f5cfa…

2 weeks, 4 days

git:master:b19c0aa3: print_lib: relocated to archive

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b19c0aa3424e19b1f8f7131c1c9c2965ebccd82f URL: https://github.com/kamailio/kamailio/commit/b19c0aa3424e19b1f8f7131c1c9c296… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T17:05:53+01:00 print_lib: relocated to archive --- Removed: src/modules/print_lib/CMakeLists.txt Removed: src/modules/print_lib/Makefile Removed: src/modules/print_lib/README Removed: src/modules/print_lib/doc/Makefile Removed: src/modules/print_lib/doc/functions.xml Removed: src/modules/print_lib/doc/print_lib.xml Removed: src/modules/print_lib/print_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/b19c0aa3424e19b1f8f7131c1c9c296… Patch: https://github.com/kamailio/kamailio/commit/b19c0aa3424e19b1f8f7131c1c9c296…

2 weeks, 4 days

git:master:10d2cd68: lib/binrpc: relocated to archive

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 10d2cd688dd55b0c5325a6527642483b024b58ea URL: https://github.com/kamailio/kamailio/commit/10d2cd688dd55b0c5325a6527642483… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T17:05:24+01:00 lib/binrpc: relocated to archive --- Removed: src/lib/binrpc/Makefile Removed: src/lib/binrpc/Makefile.nonser Removed: src/lib/binrpc/README Removed: src/lib/binrpc/binrpc_api.c Removed: src/lib/binrpc/binrpc_api.h --- Diff: https://github.com/kamailio/kamailio/commit/10d2cd688dd55b0c5325a6527642483… Patch: https://github.com/kamailio/kamailio/commit/10d2cd688dd55b0c5325a6527642483…

2 weeks, 4 days

git:master:bdae2469: lib/print: relocated to archive

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bdae2469ab839ce87f3fca2a5fee6e7b1f9be9c5 URL: https://github.com/kamailio/kamailio/commit/bdae2469ab839ce87f3fca2a5fee6e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T17:03:22+01:00 lib/print: relocated to archive --- Removed: src/lib/print/.cvsignore Removed: src/lib/print/CMakeLists.txt Removed: src/lib/print/Makefile Removed: src/lib/print/README Removed: src/lib/print/print.c Removed: src/lib/print/print.h --- Diff: https://github.com/kamailio/kamailio/commit/bdae2469ab839ce87f3fca2a5fee6e7… Patch: https://github.com/kamailio/kamailio/commit/bdae2469ab839ce87f3fca2a5fee6e7… --- diff --git a/src/lib/print/.cvsignore b/src/lib/print/.cvsignore deleted file mode 100644 index ba8401cbc92..00000000000 --- a/src/lib/print/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -libprint.so.* - diff --git a/src/lib/print/CMakeLists.txt b/src/lib/print/CMakeLists.txt deleted file mode 100644 index 25b8dcb2c86..00000000000 --- a/src/lib/print/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -project(kamailio_lib_print VERSION 1.2.1) - -file(GLOB SRC_FILES "*.c") - -# Original target to be named as folder, so when included from lib/CMakeLists.txt -# it will be named as lib/ims.so -add_library(lib_print SHARED ${SRC_FILES}) - -target_link_libraries(lib_print common kamailio) - -# TODO: do we need version control? -set_target_properties( - lib_print PROPERTIES VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} - OUTPUT_NAME print -) -set_target_properties(lib_print PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}) diff --git a/src/lib/print/Makefile b/src/lib/print/Makefile deleted file mode 100644 index 731ffea2e5b..00000000000 --- a/src/lib/print/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# example library makefile -# - -include ../../Makefile.defs -auto_gen= -NAME:=print -MAJOR_VER=1 -MINOR_VER=2 -BUGFIX_VER=1 -LIBS= - -include ../../Makefile.libs - diff --git a/src/lib/print/README b/src/lib/print/README deleted file mode 100644 index 0d1a5f496d6..00000000000 --- a/src/lib/print/README +++ /dev/null @@ -1,11 +0,0 @@ -example print library --------------- - - -Description: ------------- - -This library is an example on how to implement a ser specific library -(see the Makefile). -See also modules/print_lib for a library usage example. - diff --git a/src/lib/print/print.c b/src/lib/print/print.c deleted file mode 100644 index c2783d096f9..00000000000 --- a/src/lib/print/print.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * example library - */ - - -#include <stdio.h> - -int stderr_println(char *text) -{ - fprintf(stderr, "%s\n", text); - return 0; -} diff --git a/src/lib/print/print.h b/src/lib/print/print.h deleted file mode 100644 index 4fd823c5002..00000000000 --- a/src/lib/print/print.h +++ /dev/null @@ -1,7 +0,0 @@ - -#ifndef _print_h -#define _print_h - -int stderr_println(char *text); - -#endif

2 weeks, 4 days

git:master:593e3ec3: modules: readme files regenerated - ims_auth ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 593e3ec3546b645e0224d0dc633a263a56356f9e URL: https://github.com/kamailio/kamailio/commit/593e3ec3546b645e0224d0dc633a263… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-12-05T11:46:10+01:00 modules: readme files regenerated - ims_auth ... [skip ci] --- Modified: src/modules/ims_auth/README --- Diff: https://github.com/kamailio/kamailio/commit/593e3ec3546b645e0224d0dc633a263… Patch: https://github.com/kamailio/kamailio/commit/593e3ec3546b645e0224d0dc633a263… --- diff --git a/src/modules/ims_auth/README b/src/modules/ims_auth/README index 322bf3fe604..44ab1b76c12 100644 --- a/src/modules/ims_auth/README +++ b/src/modules/ims_auth/README @@ -55,6 +55,7 @@ Carsten Bock 3.13. add_authinfo_hdr (integer) 3.14. ignore_failed_auth (integer) 3.15. av_check_only_impu (integer) + 3.16. av_mode (integer) 4. Functions @@ -87,10 +88,11 @@ Carsten Bock 1.13. add_authinfo_hdr parameter usage 1.14. ignore_failed_auth parameter usage 1.15. av_check_only_impu parameter usage - 1.16. www_authorize usage - 1.17. ims_www_challenge usage + 1.16. av_mode parameter usage + 1.17. www_authorize usage 1.18. ims_www_challenge usage - 1.19. proxy_authorize usage + 1.19. ims_www_challenge usage + 1.20. proxy_authorize usage Chapter 1. Admin Guide @@ -119,6 +121,7 @@ Chapter 1. Admin Guide 3.13. add_authinfo_hdr (integer) 3.14. ignore_failed_auth (integer) 3.15. av_check_only_impu (integer) + 3.16. av_mode (integer) 4. Functions @@ -151,8 +154,9 @@ Chapter 1. Admin Guide The Following modules must be loaded before this module: * TM - Transaction Manager - * CDP - C Diameter Peer - * CDP_AVP - CDP AVP Applications + * CDP - C Diameter Peer (for av_mode=0) + * CDP_AVP - CDP AVP Applications (for av_mode=0) + * GCRYPT - GNU Crypto functions (for av_mode=1) 2.2. External Libraries or Applications @@ -175,6 +179,7 @@ Chapter 1. Admin Guide 3.13. add_authinfo_hdr (integer) 3.14. ignore_failed_auth (integer) 3.15. av_check_only_impu (integer) + 3.16. av_mode (integer) 3.1. name (string) @@ -363,6 +368,16 @@ modparam("ims_auth", "ignore_failed_auth", 1) modparam("ims_auth", "av_check_only_impu", 1) ... +3.16. av_mode (integer) + + Control how authentication vector is generated: 0 - get it from HSS via + DIAMETER; 1 - generate it locally. Default is 0. + + Example 1.16. av_mode parameter usage +... +modparam("ims_auth", "av_mode", 1) +... + 4. Functions 4.1. ims_www_authorize(realm, table) @@ -401,7 +416,7 @@ modparam("ims_auth", "av_check_only_impu", 1) This function can be used from REQUEST_ROUTE. - Example 1.16. www_authorize usage + Example 1.17. www_authorize usage ... if (!www_authorize("kamailio.org", "subscriber")) { www_challenge(""REG_MAR_REPLY"", "kamailio.org", "1"); @@ -440,7 +455,7 @@ if (!www_authorize("kamailio.org", "subscriber")) { This function can be used from REQUEST_ROUTE. - Example 1.17. ims_www_challenge usage + Example 1.18. ims_www_challenge usage ... if (!proxy_authorize("$fd", "subscriber)) { proxy_challenge(""REG_MAR_REPLY","$fd"); # Realm will be autogenerated @@ -485,7 +500,7 @@ e\n"); This function can be used from REQUEST_ROUTE. - Example 1.18. ims_www_challenge usage + Example 1.19. ims_www_challenge usage ... if (!ims_www_authenticate(NETWORKNAME)) { #user has not been authenticated. Lets send a challenge via 401 @@ -535,7 +550,7 @@ Unauthorized This function can be used from REQUEST_ROUTE. - Example 1.19. proxy_authorize usage + Example 1.20. proxy_authorize usage ... if (!proxy_authorize("$fd", "subscriber)) { proxy_challenge("REG_MAR_REPLY","$fd", "1"); # Realm will be autogenera

2 weeks, 4 days

git: new commits in branch master

by Daniel-Constantin Mierla

- URL: https://github.com/kamailio/kamailio/commit/f08e98a39a2e18502f70108fea159e5… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: added Milenage, AES-128 (Rijndael) and auth_vector local generation - URL: https://github.com/kamailio/kamailio/commit/e31f48b4658ae4f41bc5d9e1fe979d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: new av_mode parameter - to control how AV are managed - URL: https://github.com/kamailio/kamailio/commit/2559363525f49c65c822806ab50c95b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: synced functions with number of parameters - renamed some parameters to be suggestive - split wrapper functions that execute evaluation of fixed-up parameters - URL: https://github.com/kamailio/kamailio/commit/6e48bfd66b0730b2e5ae3458a0fe5d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: function to set ims auth data - k, op, op_c and amf - URL: https://github.com/kamailio/kamailio/commit/9ccaec9f065d02f71b275eadc1e1f19… Author: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-12-05T11:43:55+01:00 ims_auth: reworked the local AV API - URL: https://github.com/kamailio/kamailio/commit/24548be94ac9d291f4693c55e20c5fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: generate local auth vector when none is found for challenge - URL: https://github.com/kamailio/kamailio/commit/c3c9ae6c5f3c3537f0dd7c7d3b715c8… Author: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-12-05T11:43:55+01:00 ims_auth: fixed compilation and moved back auth_vector to authorize.h - URL: https://github.com/kamailio/kamailio/commit/08ff3b46223f7208d8adb23a70dced4… Author: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-12-05T11:43:55+01:00 ims_auth: integrated local resync - URL: https://github.com/kamailio/kamailio/commit/391474c43a3a0a77ab03044e3606ef7… Author: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-12-05T11:43:55+01:00 ims_auth: dropped all old vectors on local resync - URL: https://github.com/kamailio/kamailio/commit/5fc56046351aeff88cb2788f3b75cd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: docs for av_mode parameter - URL: https://github.com/kamailio/kamailio/commit/3c8ae737f2c3d67f36045d235b27bdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: relocated aes128.{c,h} to gcrypt module - they use libgcrypt - URL: https://github.com/kamailio/kamailio/commit/c206d4093c15582283ce492891f003c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 gcrypt: exported api for aes128 functions - URL: https://github.com/kamailio/kamailio/commit/bbb4047583495bd26e5fd5b61b6dc03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 gcrypt: include file for binding module exports - URL: https://github.com/kamailio/kamailio/commit/7c3a23867fe107b82c6860751fb7018… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: use gcrypt api for aes128 functions - URL: https://github.com/kamailio/kamailio/commit/5fc21d897235f0155f061962aa342ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: don't bind or use cdp when av_mode is 1 - URL: https://github.com/kamailio/kamailio/commit/22c9e3a11796d56b99550956987b661… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-05T11:43:55+01:00 ims_auth: docs updated with gcrypt dependency

2 weeks, 4 days

[kamailio/kamailio] After modifying the tag value in the To header field of the SIP 408 response using the app_python3 module, Kamailio reported an error: BUG: bad pointer 0x7f60c10a88a0 (out of memory block!). (Issue #4050)

by xianchuhan

### Description Upon interfacing with a specific carrier’s cloud relay service, upon the termination of the call by the called party after the phone rings, the tag value within the To header of the 408 response from the cloud relay side is altered. When Kamailio relays this 408 response to FreeSwitch, the sofia-sip protocol stack employed by FreeSwitch perceives it as a distinct dialog and does not promptly conclude the call. Given that the carrier’s personnel may lack the capability or the inclination to effect changes, we are looking to accommodate this scenario on the Kamailio side. Upon receipt of the 408 response from the carrier, we will determine if there has been a modification to the tag value in the To header. If such a change is detected, prior to forwarding the 408 response to FreeSwitch, we will rectify the tag value in the To header of the 408 response to correspond with the tag value from the 18x signaling messages. Our system : OS: Rocky Linux release 9.3 (Blue Onyx) Kamailo vesion 5.7.3 ### Troubleshooting #### Reproduction In the kamailio.cfg, invoke a Python script within the onreply_route[MANAGE_REPLY] block The following two scenarios both result in content-related errors: 1. First, the ‘To’ header field is removed using msg.call_function(‘remove_hf’, ‘To’), and then the modified ‘To’ header field is added using msg.call_function(‘append_hf’, sip_to). 2. The tag value in the ‘To’ header field is changed back to the original value using msg.call_function(‘replace_hdrs’, toTag, originalToTag). #### Log Messages Dec 4 13:45:00 sipp102 ./kamailio[391888]: INFO: {2 92091734 INVITE a18e6868-2ca5-123e-a394-00163e347028} app_python3 [mod_Logger.c:172]: logger_LM_INFO(): recv 408, sip_to_field_val = <sip:130679333xx@39.106.31.1xx:5060>;tag=3b47-eb967d112cba8f7d5eb856259e056294 toUri = <sip:130679333xx@39.106.31.1xx:5060> toTag = tag=3b47-eb967d112cba8f7d5eb856259e056294 originalToTag = tag=as73409c31 Dec 4 13:45:00 sipp102 ./kamailio[391888]: CRITICAL: {2 92091734 INVITE a18e6868-2ca5-123e-a394-00163e347028} <core> [core/mem/q_malloc.c:515]: qm_free(): BUG: bad pointer 0x7f60c10a88a0 (out of memory block!) called from app_python3: python_msgobj.c: msg_call_function(258) - ignoring #### SIP Traffic Received 408： Forwarded 408: ![image](https://github.com/user-attachments/assets/4497efd6-23ec-4529-8388-593e0fa838c8) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4050 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4050(a)github.com>

2 weeks, 4 days

git:master:684533d0: tls: update docs about thread-locals

by S-P Chan

Module: kamailio Branch: master Commit: 684533d099d304091082fd8a130619a4c5550a80 URL: https://github.com/kamailio/kamailio/commit/684533d099d304091082fd8a130619a… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-12-05T09:28:07+08:00 tls: update docs about thread-locals --- Modified: src/modules/tls/OpenSSL3-README.md --- Diff: https://github.com/kamailio/kamailio/commit/684533d099d304091082fd8a130619a… Patch: https://github.com/kamailio/kamailio/commit/684533d099d304091082fd8a130619a… --- diff --git a/src/modules/tls/OpenSSL3-README.md b/src/modules/tls/OpenSSL3-README.md index 6b6a7814129..ccc59957869 100644 --- a/src/modules/tls/OpenSSL3-README.md +++ b/src/modules/tls/OpenSSL3-README.md @@ -52,4 +52,99 @@ It is assumed that all `pthread_key_t` values at the high-water mark or greater by non-OpenSSL libraries. During fork, tls.so will clear all thread-locals up to the high-water mark. - +## Update +@meengu(github) has an alternate solution from this [issue](https://github.com/OpenSIPS/opensips/issues/3388) +The diff is included here for future reference. It may prove useful if the current +solution fails in later versions of OpenSSL. + + From 84b4df66853506ce8d4853ec0fbcb25545a67a54 Mon Sep 17 00:00:00 2001 + From: Ondrej Jirman <megi(a)xff.cz> + Date: Mon, 13 May 2024 17:34:52 +0200 + Subject: [PATCH] Fix openssl TLS data corruption in shared memory by workers + + The problem is that somet TLS state is shared among workers but should + not be. We solve this by clearing the relevant TLS data after fork in the + child process. + + We identify the data to clear by asking OPENSSL itself for the pointers, + and then searching through the first 32 TLS items. + + Signed-off-by: Ondrej Jirman <megi(a)xff.cz> + --- + modules/tls_openssl/openssl.c | 47 +++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) + + diff --git a/modules/tls_openssl/openssl.c b/modules/tls_openssl/openssl.c + index 522b68258527..067865eef20f 100644 + --- a/modules/tls_openssl/openssl.c + +++ b/modules/tls_openssl/openssl.c + @@ -29,6 +29,9 @@ + #include <openssl/opensslv.h> + #include <openssl/err.h> + #include <openssl/rand.h> + +#if OPENSSL_VERSION_NUMBER < 0x30000000L + +#include <openssl/rand_drbg.h> + +#endif + + #include "../../dprint.h" + #include "../../mem/shm_mem.h" + @@ -188,6 +191,48 @@ static int check_for_krb(void) + } + #endif + + +static void clean_openssl_locals(void) + +{ + +#if OPENSSL_VERSION_NUMBER < 0x30000000L + + ERR_STATE *es = ERR_get_state(); + + RAND_DRBG *r0 = RAND_DRBG_get0_public(); + + RAND_DRBG *r1 = RAND_DRBG_get0_private(); + + + + for(int k = 0; k < 32; k++) { + + void* p = pthread_getspecific(k); + + if (p && p == es) { + + pthread_setspecific(k, NULL); + + ERR_clear_error(); + + } else if (p && p == r0) { + + pthread_setspecific(k, NULL); + + RAND_DRBG_get0_public(); + + } else if (p && p == r1) { + + pthread_setspecific(k, NULL); + + RAND_DRBG_get0_private(); + + } + + } + +#else + + OSSL_LIB_CTX *ctx = OSSL_LIB_CTX_get0_global_default(); + + ERR_STATE *es = ERR_get_state(); + + EVP_RAND_CTX *r0 = RAND_get0_public(ctx); + + EVP_RAND_CTX *r1 = RAND_get0_private(ctx); + + + + for(int k = 0; k < 32; k++) { + + void* p = pthread_getspecific(k); + + if (p && p == es) { + + pthread_setspecific(k, NULL); + + ERR_clear_error(); + + } else if (p && p == r0) { + + pthread_setspecific(k, NULL); + + RAND_get0_public(ctx); + + } else if (p && p == r1) { + + pthread_setspecific(k, NULL); + + RAND_get0_private(ctx); + + } + + } + +#endif + +} + + + /* + * initialize ssl methods + */ + @@ -297,6 +342,8 @@ static int mod_init(void) + on_exit(openssl_on_exit, NULL); + #endif + + + pthread_atfork(NULL, NULL, clean_openssl_locals); + + + return 0; + } + + -- + 2.45.0

2 weeks, 4 days

← Newer
1
...
24
25
26
27
28
29
30
31
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024