sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:9a3a8f15: keepalive: added uuid to ka_dest structure to avoid passing the whole struct to tm
by Nacho Garcia Segovia 04 Sep '20

04 Sep '20

Module: kamailio Branch: master Commit: 9a3a8f15381c213901279c4a10f99d2ffcde85b1 URL: https://github.com/kamailio/kamailio/commit/9a3a8f15381c213901279c4a10f99d2… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-09-02T15:15:41+02:00 keepalive: added uuid to ka_dest structure to avoid passing the whole struct to tm - This avoids a race condition that may happen processing tm_request callbacl - Allows to identify uniquely a ka_dest record --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9a3a8f15381c213901279c4a10f99d2… Patch: https://github.com/kamailio/kamailio/commit/9a3a8f15381c213901279c4a10f99d2…

1 0

[kamailio/kamailio] Kamailio crashing when applying s.prefixes transformation on empty string (#2467)
by cmcom-gb 04 Sep '20

04 Sep '20

### Description Applying a simple `{s.prefixes}` transformation on a variable with an empty value crashes Kamailio. It is not specific to a particular SIP message being processed. ### Troubleshooting #### Reproduction ``` request_route { $var(empty) = ""; $var(result) = $(var(empty){s.prefixes}); drop; } ``` #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages ``` kernel: [27707776.714159] kamailio[13060]: segfault at 562232762ff0 ip 00007f82a1e76391 sp 00007ffc3bc7fcd8 error 4 in libc-2.24.so[7f82a1d4d000+195000] ``` #### SIP Traffic Any SIP traffic will do, as long as this particular scenario is hit, for whatever reason. Could be buggy business logic. ### Possible Solutions The only thing I could think of is to place the transformation inside an `if` statement which checks for an empty value of the variable the `{s.prefixes]` transformation is being applied to. ### Additional Information I've tested this with Kamailio 5.1 and 5.4, and both have this issue. * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.0 (x86_64/linux) version: kamailio 5.1.10 (x86_64/linux) ``` * **Operating System**: ``` Kamailio 5.1.10 -> Debian GNU/Linux 9.13 (stretch) Kamailio 5.4.0 -> Debian GNU/Linux 9.8 (stretch) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2467

2 2

git:5.2:41a9d81e: pv: handle s.prefixes for empty values
by Daniel-Constantin Mierla 04 Sep '20

04 Sep '20

Module: kamailio Branch: 5.2 Commit: 41a9d81e63bd4a3e44fcd00d2cf2c2855079b41b URL: https://github.com/kamailio/kamailio/commit/41a9d81e63bd4a3e44fcd00d2cf2c28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-04T10:45:38+02:00 pv: handle s.prefixes for empty values - avoid crash due to invalid length of result, GH #2467 (cherry picked from commit e74b06c32bc2b090937350858f655af4ab89ff63) (cherry picked from commit ad14b61155686aead27e7ac5f3fb6b1aa90b6840) (cherry picked from commit 8fcbfc697eaa7df91e84bfbf484ed51a49fc0e2e) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/41a9d81e63bd4a3e44fcd00d2cf2c28… Patch: https://github.com/kamailio/kamailio/commit/41a9d81e63bd4a3e44fcd00d2cf2c28… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 8ab46d328f..9b512e860f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -837,6 +837,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); + /* Set maximum prefix length */ max = val->rs.len; if(tp!=NULL) { @@ -875,7 +876,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer; - val->rs.len = j-1; + val->rs.len = (j>0)?(j-1):0; break;

1 0

git:5.3:8fcbfc69: pv: handle s.prefixes for empty values
by Daniel-Constantin Mierla 04 Sep '20

04 Sep '20

Module: kamailio Branch: 5.3 Commit: 8fcbfc697eaa7df91e84bfbf484ed51a49fc0e2e URL: https://github.com/kamailio/kamailio/commit/8fcbfc697eaa7df91e84bfbf484ed51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-04T10:44:36+02:00 pv: handle s.prefixes for empty values - avoid crash due to invalid length of result, GH #2467 (cherry picked from commit e74b06c32bc2b090937350858f655af4ab89ff63) (cherry picked from commit ad14b61155686aead27e7ac5f3fb6b1aa90b6840) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/8fcbfc697eaa7df91e84bfbf484ed51… Patch: https://github.com/kamailio/kamailio/commit/8fcbfc697eaa7df91e84bfbf484ed51… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index dfc842aac1..b95ffd135c 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -838,6 +838,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); + /* Set maximum prefix length */ max = val->rs.len; if(tp!=NULL) { @@ -876,7 +877,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer; - val->rs.len = j-1; + val->rs.len = (j>0)?(j-1):0; break;

1 0

git:5.4:ad14b611: pv: handle s.prefixes for empty values
by Daniel-Constantin Mierla 04 Sep '20

04 Sep '20

Module: kamailio Branch: 5.4 Commit: ad14b61155686aead27e7ac5f3fb6b1aa90b6840 URL: https://github.com/kamailio/kamailio/commit/ad14b61155686aead27e7ac5f3fb6b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-04T10:32:34+02:00 pv: handle s.prefixes for empty values - avoid crash due to invalid length of result, GH #2467 (cherry picked from commit e74b06c32bc2b090937350858f655af4ab89ff63) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/ad14b61155686aead27e7ac5f3fb6b1… Patch: https://github.com/kamailio/kamailio/commit/ad14b61155686aead27e7ac5f3fb6b1… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index d07e55e719..cdfcd3ddf3 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -909,6 +909,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); + /* Set maximum prefix length */ max = val->rs.len; if(tp!=NULL) { @@ -947,7 +948,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer; - val->rs.len = j-1; + val->rs.len = (j>0)?(j-1):0; break;

1 0

git:master:e74b06c3: pv: handle s.prefixes for empty values
by Daniel-Constantin Mierla 04 Sep '20

04 Sep '20

Module: kamailio Branch: master Commit: e74b06c32bc2b090937350858f655af4ab89ff63 URL: https://github.com/kamailio/kamailio/commit/e74b06c32bc2b090937350858f655af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-04T10:22:52+02:00 pv: handle s.prefixes for empty values - avoid crash due to invalid length of result, GH #2467 --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/e74b06c32bc2b090937350858f655af… Patch: https://github.com/kamailio/kamailio/commit/e74b06c32bc2b090937350858f655af… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 4de9849165..437e3b2e74 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -909,6 +909,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); + /* Set maximum prefix length */ max = val->rs.len; if(tp!=NULL) { @@ -947,7 +948,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer; - val->rs.len = j-1; + val->rs.len = (j>0)?(j-1):0; break;

1 0

git:master:99d96c4f: core: cast to unsigned to make analyzers happy on index type
by Daniel-Constantin Mierla 03 Sep '20

03 Sep '20

Module: kamailio Branch: master Commit: 99d96c4f5f82ca33fc6c0ccac383a3e41058405d URL: https://github.com/kamailio/kamailio/commit/99d96c4f5f82ca33fc6c0ccac383a3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-03T14:03:02+02:00 core: cast to unsigned to make analyzers happy on index type --- Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/parser/parse_hname2.c --- Diff: https://github.com/kamailio/kamailio/commit/99d96c4f5f82ca33fc6c0ccac383a3e… Patch: https://github.com/kamailio/kamailio/commit/99d96c4f5f82ca33fc6c0ccac383a3e… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 6eccec29bd..d17540de72 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1448,7 +1448,7 @@ assign_stm: | USER_AGENT_HEADER EQUAL error { yyerror("string value expected"); } | URI_HOST_EXTRA_CHARS EQUAL STRING { _sr_uri_host_extra_chars=$3; } | URI_HOST_EXTRA_CHARS EQUAL error { yyerror("string value expected"); } - | HDR_NAME_EXTRA_CHARS EQUAL STRING { _ksr_hname_extra_chars=$3; } + | HDR_NAME_EXTRA_CHARS EQUAL STRING { _ksr_hname_extra_chars=(unsigned char*)$3; } | HDR_NAME_EXTRA_CHARS EQUAL error { yyerror("string value expected"); } | REPLY_TO_VIA EQUAL NUMBER { reply_to_via=$3; } | REPLY_TO_VIA EQUAL error { yyerror("boolean value expected"); } diff --git a/src/core/globals.h b/src/core/globals.h index 413e8f2374..ea16f3ae29 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -216,7 +216,7 @@ extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; extern char *_sr_uri_host_extra_chars; -extern char *_ksr_hname_extra_chars; +extern unsigned char *_ksr_hname_extra_chars; extern char *ksr_stats_namesep; diff --git a/src/core/parser/parse_hname2.c b/src/core/parser/parse_hname2.c index a4fdca3e37..598008214a 100644 --- a/src/core/parser/parse_hname2.c +++ b/src/core/parser/parse_hname2.c @@ -154,17 +154,17 @@ static ksr_hdr_map_idx_t _ksr_hdr_map_idx[KSR_HDR_MAP_IDX_SIZE]; /** * valid chars in header names */ -static char *_ksr_hname_chars_list = "0123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz-._+~"; +static unsigned char *_ksr_hname_chars_list = (unsigned char*)"0123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz-._+~"; /** * additional valid chars in header names (core param) */ -char *_ksr_hname_extra_chars = ""; +unsigned char *_ksr_hname_extra_chars = (unsigned char*)""; /** * indexed valid chars in 256-array for 1-byte-index access check */ -static char _ksr_hname_chars_idx[KSR_HDR_MAP_IDX_SIZE]; +static unsigned char _ksr_hname_chars_idx[KSR_HDR_MAP_IDX_SIZE]; /** @@ -172,7 +172,7 @@ static char _ksr_hname_chars_idx[KSR_HDR_MAP_IDX_SIZE]; */ int ksr_hname_init_index(void) { - char c; + unsigned char c; int i; for(i=0; i<KSR_HDR_MAP_IDX_SIZE; i++) { @@ -231,7 +231,7 @@ char *parse_sip_header_name(char* const begin, const char* const end, hdr->type = HDR_ERROR_T; return begin; } - if(_ksr_hname_chars_idx[*begin] == 0) { + if(_ksr_hname_chars_idx[(unsigned char)(*begin)] == 0) { LM_ERR("invalid start of header name for [%.*s]\n", (int)(end-begin), begin); hdr->type = HDR_ERROR_T; @@ -241,7 +241,7 @@ char *parse_sip_header_name(char* const begin, const char* const end, hdr->name.s = begin; for(p=begin+1; p<end; p++) { - if(_ksr_hname_chars_idx[*p] == 0) { + if(_ksr_hname_chars_idx[(unsigned char)(*p)] == 0) { /* char not allowed in header name */ break; } @@ -279,9 +279,9 @@ char *parse_sip_header_name(char* const begin, const char* const end, done: /* lookup header type */ - if(_ksr_hdr_map_idx[hdr->name.s[0]].idxs >= 0) { - for(i = _ksr_hdr_map_idx[hdr->name.s[0]].idxs; - i <= _ksr_hdr_map_idx[hdr->name.s[0]].idxe; i++) { + if(_ksr_hdr_map_idx[(unsigned char)(hdr->name.s[0])].idxs >= 0) { + for(i = _ksr_hdr_map_idx[(unsigned char)(hdr->name.s[0])].idxs; + i <= _ksr_hdr_map_idx[(unsigned char)(hdr->name.s[0])].idxe; i++) { if(hdr->name.len == _ksr_hdr_map[i].hname.len && strncasecmp(hdr->name.s, _ksr_hdr_map[i].hname.s, hdr->name.len) == 0) { @@ -308,4 +308,4 @@ char* parse_hname2(char* const begin, const char* const end, struct hdr_field* c char* parse_hname2_short(char* const begin, const char* const end, struct hdr_field* const hdr) { return parse_sip_header_name(begin, end, hdr, 0); -} \ No newline at end of file +}

1 0

git:master:138097c1: pike: use core search functions
by Daniel-Constantin Mierla 03 Sep '20

03 Sep '20

Module: kamailio Branch: master Commit: 138097c19ba7b00eac983798a72225ab73ddf73d URL: https://github.com/kamailio/kamailio/commit/138097c19ba7b00eac983798a72225a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-03T13:08:38+02:00 pike: use core search functions --- Modified: src/modules/pike/pike_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/138097c19ba7b00eac983798a72225a… Patch: https://github.com/kamailio/kamailio/commit/138097c19ba7b00eac983798a72225a… --- diff --git a/src/modules/pike/pike_rpc.c b/src/modules/pike/pike_rpc.c index e3997e34b3..a94b3762cd 100644 --- a/src/modules/pike/pike_rpc.c +++ b/src/modules/pike/pike_rpc.c @@ -26,6 +26,7 @@ #include "../../core/timer.h" /* ticks_t */ #include "../../core/dprint.h" +#include "../../core/ut.h" #include "pike_top.h" #include <stdlib.h> @@ -128,11 +129,11 @@ static void pike_top(rpc_t *rpc, void *c) stropts = "HOT"; DBG("pike:top: string options: '%s'", stropts); - if ( strcasestr(stropts, "ALL") ) { + if ( strz_casesearch_strz(stropts, "ALL") ) { options = NODE_STATUS_ALL; - } else if ( strcasestr(stropts, "HOT") ) { + } else if ( strz_casesearch_strz(stropts, "HOT") ) { options |= NODE_STATUS_HOT; - } else if ( strcasestr(stropts, "WARM") ) { + } else if ( strz_casesearch_strz(stropts, "WARM") ) { options |= NODE_STATUS_WARM; } DBG("pike:top: options: 0x%02x\n", options);

1 0

git:master:42228552: core: helper functions to search variants of str in another str
by Daniel-Constantin Mierla 03 Sep '20

03 Sep '20

Module: kamailio Branch: master Commit: 42228552b72267786561704f120e3da3aac5fd89 URL: https://github.com/kamailio/kamailio/commit/42228552b72267786561704f120e3da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-03T12:47:50+02:00 core: helper functions to search variants of str in another str --- Modified: src/core/tcp_read.c Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/42228552b72267786561704f120e3da… Patch: https://github.com/kamailio/kamailio/commit/42228552b72267786561704f120e3da… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 655db7da7b..6a005a9a32 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -110,26 +110,6 @@ int tcp_set_clone_rcvbuf(int v) } #ifdef READ_HTTP11 -static inline char *strfindcasestrz(str *haystack, char *needlez) -{ - int i,j; - str needle; - - needle.s = needlez; - needle.len = strlen(needlez); - for(i=0;i<haystack->len-needle.len;i++) { - for(j=0;j<needle.len;j++) { - if ( !((haystack->s[i+j]==needle.s[j]) || - ( isalpha((int)haystack->s[i+j]) - && ((haystack->s[i+j])^(needle.s[j]))==0x20 )) ) - break; - } - if (j==needle.len) - return haystack->s+i; - } - return 0; -} - int tcp_http11_continue(struct tcp_connection *c) { struct dest_info dst; @@ -161,7 +141,7 @@ int tcp_http11_continue(struct tcp_connection *c) return 0; /* check for Expect header */ - if(strfindcasestrz(&msg, "Expect: 100-continue")!=NULL) + if(str_casesearch_strz(&msg, "Expect: 100-continue")!=NULL) { init_dst_from_rcv(&dst, &c->rcv); if (tcp_send(&dst, 0, HTTP11CONTINUE, HTTP11CONTINUE_LEN) < 0) { @@ -169,7 +149,7 @@ int tcp_http11_continue(struct tcp_connection *c) } } /* check for Transfer-Encoding header */ - if(strfindcasestrz(&msg, "Transfer-Encoding: chunked")!=NULL) + if(str_casesearch_strz(&msg, "Transfer-Encoding: chunked")!=NULL) { c->req.flags |= F_TCP_REQ_BCHUNKED; ret = 1; @@ -178,7 +158,7 @@ int tcp_http11_continue(struct tcp_connection *c) * - HTTP Via format is different that SIP Via * - workaround: replace with Hia to be ignored by SIP parser */ - if((p=strfindcasestrz(&msg, "\nVia:"))!=NULL) + if((p=str_casesearch_strz(&msg, "\nVia:"))!=NULL) { p++; *p = 'H'; diff --git a/src/core/ut.c b/src/core/ut.c index 90b01d1026..0189b642ab 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -296,6 +296,53 @@ char *str_search(str *text, str *needle) return NULL; } +/** + * @brief case insensitive search for occurence of needle in text + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_casesearch(str *text, str *needle) +{ + int i,j; + for(i=0;i<text->len-needle->len;i++) { + for(j=0;j<needle->len;j++) { + if ( !((text->s[i+j]==needle->s[j]) || + ( isalpha((int)text->s[i+j]) + && ((text->s[i+j])^(needle->s[j]))==0x20 )) ) + break; + } + if (j==needle->len) + return text->s+i; + } + return 0; +} + +/** + * portable strcasestr() - the libc version requires #define _GNU_SOURCE + */ +char *strz_casesearch_strz(char *textz, char *needlez) +{ + str text; + + text.s = textz; + text.len = strlen(textz); + + return str_casesearch_strz(&text, needlez); +} + +/** + * case insensitive search of a charz string 'needlez' inside str 'text' + */ +char *str_casesearch_strz(str *text, char *needlez) +{ + str needle; + + needle.s = needlez; + needle.len = strlen(needlez); + + return str_casesearch(text, &needle); +} + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or diff --git a/src/core/ut.h b/src/core/ut.h index 56c1f9e157..6ef2e079bc 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1053,6 +1053,12 @@ char* get_abs_pathname(str* base, str* file); */ char *str_search(str *text, str *needle); +char *str_casesearch(str *text, str *needle); + +char *strz_casesearch_strz(char *textz, char *needlez); + +char *str_casesearch_strz(str *text, char *needlez); + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or

1 0

git:master:bffd78f1: Revert "tls: added define condition on version functions"
by Victor Seva 02 Sep '20

02 Sep '20

Module: kamailio Branch: master Commit: bffd78f14921f67735a64caea2fb130393daa2bc URL: https://github.com/kamailio/kamailio/commit/bffd78f14921f67735a64caea2fb130… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-02T14:27:24+02:00 Revert "tls: added define condition on version functions" This reverts commit 99c6a68dea60ca745dfdfa33085bb6acbcee846a. --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/bffd78f14921f67735a64caea2fb130… Patch: https://github.com/kamailio/kamailio/commit/bffd78f14921f67735a64caea2fb130… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 2930bde2be..fc84033e68 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -63,11 +63,9 @@ static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - if (SSLeay() < 0x1000005fL) { + if (OpenSSL_version_num() < 0x1000005fL) { return; } -#endif ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index f10d0c0344..351ed4187e 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -645,7 +645,6 @@ int tls_h_mod_init_f(void) { /*struct socket_info* si;*/ long ssl_version; - const char *ssl_version_txt; #if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) int lib_kerberos; int lib_zlib; @@ -668,15 +667,7 @@ int tls_h_mod_init_f(void) #if OPENSSL_VERSION_NUMBER < 0x00907000L LM_WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif - -#if OPENSSL_VERSION_NUMBER < 0x010100000L - ssl_version=SSLeay(); - ssl_version_txt=SSLeay_version(SSLEAY_VERSION); -#else ssl_version=OpenSSL_version_num(); - ssl_version_txt=OpenSSL_version(OPENSSL_VERSION); -#endif - /* check if version have the same major minor and fix level * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) * - values is represented as 0xMMNNFFPPS: major minor fix patch status @@ -688,7 +679,7 @@ int tls_h_mod_init_f(void) " compiled \"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" " (tls_force_run in kamailio.cfg will override this check)\n", - ssl_version_txt, ssl_version, + OpenSSL_version(OPENSSL_VERSION), ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) LM_WARN("tls_force_run turned on, ignoring "

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev