sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
303 discussions

[kamailio/kamailio] [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ (#2717)

by space88man

Address GH #2716. Also see https://bugs.python.org/issue29697.   #### Pre-Submission Checklist    - [X ] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X ] Tested changes locally - [ ] Related to issue #2716 #### Description For OpenSSL 1.1.x initialization of EC SSL contexts has changed — we should be using the < 1.0.2 technique on OpenSSL 1.1+. This addresses a corner case where TLS server with P-256 cert would not handshake with a TLS client presenting a P-521 cert. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2717 -- Commit Summary -- * [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ -- File Changes -- M src/modules/tls/tls_domain.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2717.patch https://github.com/kamailio/kamailio/pull/2717.diff -- 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/pull/2717

3 years, 6 months

git:master:27904530: [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 27904530d1f8efd26e2b96fa5f18a3aad887919b URL: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… Author: SPChan <shihping.chan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T08:32:13+02:00 [tls] Don't use OpenSSL<1.0.2 fallback on 1.1+ Address GH #2716. Also see https://bugs.python.org/issue29697. --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… Patch: https://github.com/kamailio/kamailio/commit/27904530d1f8efd26e2b96fa5f18a3a… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index ab45fa7136..c2231b0db0 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -57,8 +57,12 @@ extern EVP_PKEY * tls_engine_private_key(const char* key_id); * ECDHE is enabled only on OpenSSL 1.0.0e and later. * See http://www.openssl.org/news/secadv_20110906.txt * for details. + * Also, copied from _ssl.c of Python for correct initialization. + * Allow automatic ECDH curve selection (on OpenSSL 1.0.2+), or use + * prime256v1 by default. This is Apache mod_ssl's initialization + * policy, so we should be safe. OpenSSL 1.1 has it enabled by default. */ -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; @@ -69,11 +73,15 @@ static void setup_ecdh(SSL_CTX *ctx) } #endif +#if defined(SSL_CTX_set_ecdh_auto) + SSL_CTX_set_ecdh_auto(ctx, 1); +#else ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); SSL_CTX_set_tmp_ecdh(ctx, ecdh); EC_KEY_free(ecdh); +#endif } #endif @@ -691,7 +699,7 @@ static int set_cipher_list(tls_domain_t* d) tls_domain_str(d), cipher_list); return -1; } -#ifndef OPENSSL_NO_ECDH +#if !defined(OPENSSL_NO_ECDH) && !defined(OPENSSL_VERSION_1_1) setup_ecdh(d->ctx[i]); #endif #ifndef OPENSSL_NO_DH

3 years, 6 months

git:master:addb6a88: msrp: check return code for str explode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: addb6a88d0266a0bb0545077fb0b5b8a3fdcca8e URL: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-29T08:25:49+02:00 msrp: check return code for str explode --- Modified: src/modules/msrp/msrp_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… Patch: https://github.com/kamailio/kamailio/commit/addb6a88d0266a0bb0545077fb0b5b8… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index 4e5e67e130..7defaf9353 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -716,6 +716,11 @@ int msrp_parse_hdr_uri_list(msrp_hdr_t *hdr) s = hdr->body; trim(&s); arr->size = msrp_explode_strz(&arr->list, &s, " "); + if(arr->size<0) + { + LM_ERR("failed to explode\n"); + return -1; + } hdr->parsed.flags |= MSRP_DATA_SET; hdr->parsed.free_fn = msrp_str_array_destroy; hdr->parsed.data = arr;

3 years, 6 months

git:master:a1bbe035: lost: fixed possible resource leak inside lost_get_response_issues()

by Wolfgang Kampichler

Module: kamailio Branch: master Commit: a1bbe035f1a1acc11f86d27fdc0adef1b1a3d010 URL: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-28T17:22:58+02:00 lost: fixed possible resource leak inside lost_get_response_issues() --- Modified: src/modules/lost/response.c --- Diff: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… Patch: https://github.com/kamailio/kamailio/commit/a1bbe035f1a1acc11f86d27fdc0adef… --- diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index b3389448b8..6eb13e8260 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -573,39 +573,53 @@ p_lost_issue_t lost_get_response_issues(xmlNodePtr node) cur = node->children; while(cur) { if(cur->type == XML_ELEMENT_NODE) { - /* get a new response type element */ + /* get a new response type object */ issue = lost_new_response_type(); if(issue == NULL) { /* didn't get it ... return */ break; } - /* parse properties */ - issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + /* get issue type */ tmp.s = (char *)cur->name; tmp.len = strlen((char *)cur->name); + /* copy issue type to object */ + len = 0; if(tmp.len > 0 && tmp.s != NULL) { issue->type = lost_copy_string(tmp, &len); } - if(len > 0) { + if(len == 0) { + /* issue type not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parse source property */ + len = 0; + issue->source = lost_get_property(cur->parent, MAPP_PROP_SRC, &len); + if(len == 0) { + /* source property not found, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } - LM_DBG("###\t[%s]\n", issue->type); + LM_DBG("###\t[%s]\n", issue->type); - if(issue->info != NULL) { - issue->info->text = lost_get_property(cur, PROP_MSG, &len); - issue->info->lang = lost_get_property(cur, PROP_LANG, &len); - } - /* get a new list element */ - new = lost_new_response_issues(); - if(new == NULL) { - /* didn't get it, delete response type element ... return */ - lost_delete_response_type(&issue); /* clean up */ - break; - } - /* append to list */ - new->issue = issue; - new->next = list; - list = new; + /* type and source property found ... parse text and copy */ + if(issue->info != NULL) { + issue->info->text = lost_get_property(cur, PROP_MSG, &len); + issue->info->lang = lost_get_property(cur, PROP_LANG, &len); } + /* get a new list element */ + new = lost_new_response_issues(); + if(new == NULL) { + /* didn't get it, clean up and return */ + lost_delete_response_type(&issue); /* clean up */ + break; + } + /* parsing done, append object to list */ + new->issue = issue; + new->next = list; + list = new; + /* get next element */ cur = cur->next; }

3 years, 6 months

git:master:7bf00811: core: kemi - parse headers before insert operation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7bf0081102a5755c3282e7f01a0f45e160fdda0f URL: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T16:06:50+02:00 core: kemi - parse headers before insert operation --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… Patch: https://github.com/kamailio/kamailio/commit/7bf0081102a5755c3282e7f01a0f45e… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index ba0b435dce..0932339996 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2143,6 +2143,11 @@ static int sr_kemi_hdr_insert(sip_msg_t *msg, str *txt) if(txt==NULL || txt->s==NULL || msg==NULL) return -1; + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { + LM_ERR("error while parsing message\n"); + return -1; + } + LM_DBG("insert hf: %.*s\n", txt->len, txt->s); hdr = (char*)pkg_malloc(txt->len); if(hdr==NULL) { @@ -2188,7 +2193,7 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) return -1; } - if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { LM_ERR("error while parsing message\n"); return -1; }

3 years, 6 months

git:master:48200f3e: textops: check for msg headers field in case is used for non-sip traffic

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 48200f3e9ca9f5e5a05de440eefc23f7265b5268 URL: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T15:57:05+02:00 textops: check for msg headers field in case is used for non-sip traffic --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… Patch: https://github.com/kamailio/kamailio/commit/48200f3e9ca9f5e5a05de440eefc23f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 3d90e97a90..2998906051 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3401,7 +3401,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, int len; str s0; - if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + if ((parse_headers(msg, HDR_EOH_F, 0) == -1) || (msg->headers == NULL)) { LM_ERR("error while parsing message\n"); return -1; }

3 years, 6 months

git:master:afff1859: ims_ipsec_pcscf: initialize variable to fix warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: afff18592998cb14561cf4fd95acd1b4866fd994 URL: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-28T13:28:05+02:00 ims_ipsec_pcscf: initialize variable to fix warnings --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… Patch: https://github.com/kamailio/kamailio/commit/afff18592998cb14561cf4fd95acd1b… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 10841c74b2..45e82ddf3e 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -681,8 +681,8 @@ static int delete_unused_sa_cb(const struct nlmsghdr *nlh, void *data) void *cp; str received_host; ip_addr_t received_host_addr; - ipsec_t ipsec; - + ipsec_t ipsec = {0}; + cp = ((struct del_tunnels*)data)->contacts; while (1) { memcpy(&(received_host.len), cp, sizeof(received_host.len)); @@ -1080,4 +1080,4 @@ int delete_unused_tunnels() free(buf); return 0; -} \ No newline at end of file +}

3 years, 6 months

[kamailio/kamailio] build warnings (#2710)

by sergey-safarov

**missing braces around initializer** *mohq_funcs.c:2163* ``` LD (gcc) [M matrix.so] matrix.so CC (gcc) [M mohqueue.so] mohq_locks.o CC (gcc) [M mohqueue.so] mohq_funcs.o mohq_funcs.c: In function 'send_rtp_answer': mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { } CC (gcc) [M mohqueue.so] mohq_db.o CC (gcc) [M mohqueue.so] mohqueue_mod.o make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M mohqueue.so] mohqueue.so CC (gcc) [M msilo.so] msfuncs.o CC (gcc) [M msilo.so] msilo.o ``` **"_POSIX_C_SOURCE" redefined** ``` CC (gcc) [M app_python.so] python_iface.o CC (gcc) [M app_python.so] apy_kemi_export.o In file included from /usr/include/python2.7/pyconfig.h:6, from /usr/include/python2.7/Python.h:8, from apy_kemi_export.c:30: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined 1232 | #define _POSIX_C_SOURCE 200112L | In file included from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:27, from apy_kemi_export.c:26: /usr/include/features.h:265: note: this is the location of the previous definition 265 | # define _POSIX_C_SOURCE 200809L | CC (gcc) [M app_python.so] mod_Core.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/pyconfig.h:6, from /usr/include/python2.7/Python.h:8, from apy_kemi.c:25: /usr/include/python2.7/pyconfig-64.h:1232: warning: "_POSIX_C_SOURCE" redefined 1232 | #define _POSIX_C_SOURCE 200112L | In file included from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:27, from apy_kemi.c:21: /usr/include/features.h:265: note: this is the location of the previous definition 265 | # define _POSIX_C_SOURCE 200809L | CC (gcc) [M app_python.so] python_msgobj.o CC (gcc) [M app_python.so] mod_Router.o CC (gcc) [M app_python.so] app_python_mod. ``` -- 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/2710

3 years, 7 months

git:master:c7781edc: mohqueue: fixed compiler warning about array initialization

by Sergey Safarov

Module: kamailio Branch: master Commit: c7781edcb37a35193ccdb9414183919aaa614d3a URL: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-04-27T13:00:35+03:00 mohqueue: fixed compiler warning about array initialization --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… Patch: https://github.com/kamailio/kamailio/commit/c7781edcb37a35193ccdb9414183919… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index dd9f105bfc..1f72c58c5a 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -2160,7 +2160,9 @@ int nsession; sdp_session_cell_t *psession; char pflagbuf [5]; strcpy (pflagbuf, "z20"); -fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; +fparam_t pzflag [1] = { + {"", FPARAM_STRING, {pflagbuf}, 0} +}; for (nsession = 0; (psession = get_sdp_session (pmsg, nsession)); nsession++) { int nstream;

3 years, 7 months

git:5.5:6b9ecb08: dispatcher: docs - set xmlns for include tags

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 6b9ecb0856a881144546fea6d3cbd8a3dc668b81 URL: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-27T10:00:41+02:00 dispatcher: docs - set xmlns for include tags (cherry picked from commit 3f25ef01c5cc3adb02dd1bfecdfd4c3ce80cef47) --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… Patch: https://github.com/kamailio/kamailio/commit/6b9ecb0856a881144546fea6d3cbd8a… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index 3888e5f281..af040e737d 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -6,12 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]> -<book xmlns:xi="http://www.w3.org/2001/XInclude"> +<book> <bookinfo> <title>DISPATCHER Module</title> <productname class="trade">&kamailioname;</productname> @@ -97,7 +94,7 @@ </bookinfo> <toc/> - <xi:include href="dispatcher_admin.xml"/> - <xi:include href="dispatcher_faq.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_admin.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher_faq.xml"/> </book> diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 45f93a3121..0ac1a430e6 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ - +  <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>  -<chapter xmlns:xi="http://www.w3.org/2001/XInclude"> +<chapter> <title>&adminguide;</title> @@ -2215,7 +2212,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>dispatcher list file</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.list" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.list" parse="text"/> ... </programlisting> </example> @@ -2231,7 +2228,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) <title>&kamailio; config script - sample dispatcher usage</title> <programlisting format="linespecific"> ... -<xi:include href="dispatcher.cfg" parse="text"/> +<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dispatcher.cfg" parse="text"/> ... </programlisting> </example>

3 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021