sr-dev

sr-dev@lists.kamailio.org

20 participants
45160 discussions

git:5.6:b0d6a66f: pkg/kamailio/obs: packaged siprepo module into RPM files
by Sergey Safarov 30 May '22

30 May '22

Module: kamailio Branch: 5.6 Commit: b0d6a66f1069f9eed5a3b551b9281dcd36fb9185 URL: https://github.com/kamailio/kamailio/commit/b0d6a66f1069f9eed5a3b551b9281dc… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-05-30T16:14:43+03:00 pkg/kamailio/obs: packaged siprepo module into RPM files (cherry picked from commit a812e490d3ba4245c2dba4f08d081a957fb5679b) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b0d6a66f1069f9eed5a3b551b9281dc… Patch: https://github.com/kamailio/kamailio/commit/b0d6a66f1069f9eed5a3b551b9281dc… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 10ada842b5..5ba68a9224 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1539,6 +1539,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sdpops %doc %{_docdir}/kamailio/modules/README.seas %doc %{_docdir}/kamailio/modules/README.sipcapture +%doc %{_docdir}/kamailio/modules/README.siprepo %doc %{_docdir}/kamailio/modules/README.sipt %doc %{_docdir}/kamailio/modules/README.siptrace %doc %{_docdir}/kamailio/modules/README.siputils @@ -1699,6 +1700,7 @@ fi %{_libdir}/kamailio/modules/sdpops.so %{_libdir}/kamailio/modules/seas.so %{_libdir}/kamailio/modules/sipcapture.so +%{_libdir}/kamailio/modules/siprepo.so %{_libdir}/kamailio/modules/sipt.so %{_libdir}/kamailio/modules/siptrace.so %{_libdir}/kamailio/modules/siputils.so

1 0

git:master:a812e490: pkg/kamailio/obs: packaged siprepo module into RPM files
by Sergey Safarov 30 May '22

30 May '22

Module: kamailio Branch: master Commit: a812e490d3ba4245c2dba4f08d081a957fb5679b URL: https://github.com/kamailio/kamailio/commit/a812e490d3ba4245c2dba4f08d081a9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-05-30T16:13:43+03:00 pkg/kamailio/obs: packaged siprepo module into RPM files --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a812e490d3ba4245c2dba4f08d081a9… Patch: https://github.com/kamailio/kamailio/commit/a812e490d3ba4245c2dba4f08d081a9… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5b87a501bcd..a2b7e1406c8 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1539,6 +1539,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sdpops %doc %{_docdir}/kamailio/modules/README.seas %doc %{_docdir}/kamailio/modules/README.sipcapture +%doc %{_docdir}/kamailio/modules/README.siprepo %doc %{_docdir}/kamailio/modules/README.sipt %doc %{_docdir}/kamailio/modules/README.siptrace %doc %{_docdir}/kamailio/modules/README.siputils @@ -1699,6 +1700,7 @@ fi %{_libdir}/kamailio/modules/sdpops.so %{_libdir}/kamailio/modules/seas.so %{_libdir}/kamailio/modules/sipcapture.so +%{_libdir}/kamailio/modules/siprepo.so %{_libdir}/kamailio/modules/sipt.so %{_libdir}/kamailio/modules/siptrace.so %{_libdir}/kamailio/modules/siputils.so

1 0

git:master:61b175bc: ims_usrloc_scscf: same type for init flag variable
by Daniel-Constantin Mierla 30 May '22

30 May '22

Module: kamailio Branch: master Commit: 61b175bcffed9492d6cc718c9ac70c4378712807 URL: https://github.com/kamailio/kamailio/commit/61b175bcffed9492d6cc718c9ac70c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T13:19:40+02:00 ims_usrloc_scscf: same type for init flag variable - it was defined as int but the extern declaration was unsigned - added ims_ulp_ prefix to avoid global scope conflict with other modules --- Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c Modified: src/modules/ims_usrloc_scscf/usrloc.c --- Diff: https://github.com/kamailio/kamailio/commit/61b175bcffed9492d6cc718c9ac70c4… Patch: https://github.com/kamailio/kamailio/commit/61b175bcffed9492d6cc718c9ac70c4… --- diff --git a/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c index bb5c394704..1a82d6bcc8 100644 --- a/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c +++ b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c @@ -116,7 +116,7 @@ str db_url = str_init(DEFAULT_DB_URL); /*!< Database URL */ /* flags */ unsigned int nat_bflag = (unsigned int)-1; -unsigned int init_flag = 0; +unsigned int ims_uls_init_flag = 0; ims_dlg_api_t dlgb; @@ -380,7 +380,7 @@ static int mod_init(void) { nat_bflag = 1 << nat_bflag; } - init_flag = 1; + ims_uls_init_flag = 1; /* From contact_dlg_handlers.c * diff --git a/src/modules/ims_usrloc_scscf/usrloc.c b/src/modules/ims_usrloc_scscf/usrloc.c index 068d9f69f2..06a082ebaa 100644 --- a/src/modules/ims_usrloc_scscf/usrloc.c +++ b/src/modules/ims_usrloc_scscf/usrloc.c @@ -55,7 +55,7 @@ /*! nat branch flag */ extern unsigned int nat_bflag; /*! flag to protect against wrong initialization */ -extern unsigned int init_flag; +extern unsigned int ims_uls_init_flag; /*! * \brief usrloc module API export bind function @@ -67,7 +67,7 @@ int bind_usrloc(usrloc_api_t* api) { LM_ERR("invalid parameter value\n"); return -1; } - if (init_flag == 0) { + if (ims_uls_init_flag == 0) { LM_ERR("configuration error - trying to bind to usrloc module" " before being initialized\n"); return -1;

1 0

git:master:44b46535: ims_usrloc_pcscf: same type for init flag variable
by Daniel-Constantin Mierla 30 May '22

30 May '22

Module: kamailio Branch: master Commit: 44b465350faa5f640262b693dfbb7959921b4cea URL: https://github.com/kamailio/kamailio/commit/44b465350faa5f640262b693dfbb795… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T13:16:07+02:00 ims_usrloc_pcscf: same type for init flag variable - it was defined as int but the extern declaration was unsigned - added ims_ulp_ prefix to avoid global scope conflict with other modules --- Modified: src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c Modified: src/modules/ims_usrloc_pcscf/usrloc.c --- Diff: https://github.com/kamailio/kamailio/commit/44b465350faa5f640262b693dfbb795… Patch: https://github.com/kamailio/kamailio/commit/44b465350faa5f640262b693dfbb795… --- diff --git a/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c index fe9a1f5f02..26aaa2773b 100644 --- a/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c +++ b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c @@ -77,13 +77,13 @@ int expires_grace = 3600; //default is a grace period of 1 hour - after this c * Module parameters and their default values */ str usrloc_debug_file = str_init(DEFAULT_DBG_FILE); -int usrloc_debug = 0; -int ul_hash_size = 9; -int init_flag = 0; -str db_url = str_init(DEFAULT_DB_URL); /*!< Database URL */ -int timer_interval = 60; /*!< Timer interval in seconds */ -int db_mode = 0; /*!< Database sync scheme: 0-no db, 1-write through, 2-write back, 3-only db */ -int ul_fetch_rows = 2000; +int usrloc_debug = 0; +int ul_hash_size = 9; +int ims_ulp_init_flag = 0; +str db_url = str_init(DEFAULT_DB_URL); /*!< Database URL */ +int timer_interval = 60; /*!< Timer interval in seconds */ +int db_mode = 0; /*!< Database sync scheme: 0-no db, 1-write through, 2-write back, 3-only db */ +int ul_fetch_rows = 2000; int match_contact_host_port = 1; /*!< Should we match contact just based on rui host and port*/ db1_con_t* ul_dbh = 0; @@ -198,7 +198,7 @@ static int mod_init(void) { LM_DBG("Running in DB mode %i\n", db_mode); } - init_flag = 1; + ims_ulp_init_flag = 1; return 0; } diff --git a/src/modules/ims_usrloc_pcscf/usrloc.c b/src/modules/ims_usrloc_pcscf/usrloc.c index 66c37ffe5f..418e1859bc 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc.c +++ b/src/modules/ims_usrloc_pcscf/usrloc.c @@ -51,14 +51,14 @@ #include "ims_usrloc_pcscf_mod.h" #include "../../core/parser/parse_uri.h" -extern unsigned int init_flag; +extern int ims_ulp_init_flag; int bind_usrloc(usrloc_api_t* api) { if (!api) { LM_ERR("invalid parameter value\n"); return -1; } - if (init_flag == 0) { + if (ims_ulp_init_flag == 0) { LM_ERR("configuration error - trying to bind to usrloc module" " before being initialized\n"); return -1;

1 0

git:master:3ba676e9: ims_ipsec_pcscf: same type for init flag variable
by Daniel-Constantin Mierla 30 May '22

30 May '22

Module: kamailio Branch: master Commit: 3ba676e9776b8fea8e64eeb8ea7520ab83b8702c URL: https://github.com/kamailio/kamailio/commit/3ba676e9776b8fea8e64eeb8ea7520a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T13:09:18+02:00 ims_ipsec_pcscf: same type for init flag variable - it was defined as int but the extern declaration was unsigned - added ipsec_ prefix to avoid global scope conflict with other modules --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3ba676e9776b8fea8e64eeb8ea7520a… Patch: https://github.com/kamailio/kamailio/commit/3ba676e9776b8fea8e64eeb8ea7520a… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index d48e280114..14e797c02b 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -67,7 +67,7 @@ extern ip_addr_t ipsec_listen_ip_addr6; extern int spi_id_start; -extern unsigned int init_flag; +extern unsigned int ipsec_init_flag; // check http://www.asipto.com/pub/kamailio-devel-guide/#c16return_values const int IPSEC_CMD_FAIL = -1; @@ -90,7 +90,7 @@ int bind_ipsec_pcscf(ipsec_pcscf_api_t *api) LM_ERR("invalid parameter value\n"); return -1; } - if(init_flag == 0) { + if(ipsec_init_flag == 0) { LM_ERR("configuration error - trying to bind to ipsec pscscf module " "before being initialized\n"); return -1; diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index b088a8af7f..20e5e1c97b 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -65,7 +65,7 @@ static int free_uint_fixup(void **param, int param_no); extern int bind_ipsec_pcscf(usrloc_api_t *api); -int init_flag = 0; +unsigned int ipsec_init_flag = 0; /* clang-format off */ @@ -363,7 +363,7 @@ static int mod_init(void) return -1; } - init_flag = 1; + ipsec_init_flag = 1; return 0; }

1 0

git:master:a4cba5ee: ims_ipsec_pcscf: clang-format for coherent indentation and coding style
by Daniel-Constantin Mierla 30 May '22

30 May '22

Module: kamailio Branch: master Commit: a4cba5eea619a62d722170ff92f4324c3e4e90cb URL: https://github.com/kamailio/kamailio/commit/a4cba5eea619a62d722170ff92f4324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T12:58:18+02:00 ims_ipsec_pcscf: clang-format for coherent indentation and coding style --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/cmd.h Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/ipsec.h Modified: src/modules/ims_ipsec_pcscf/sec_agree.c Modified: src/modules/ims_ipsec_pcscf/sec_agree.h Modified: src/modules/ims_ipsec_pcscf/spi_gen.c Modified: src/modules/ims_ipsec_pcscf/spi_gen.h Modified: src/modules/ims_ipsec_pcscf/spi_list.c Modified: src/modules/ims_ipsec_pcscf/spi_list.h Modified: src/modules/ims_ipsec_pcscf/spi_list_tests.c --- Diff: https://github.com/kamailio/kamailio/commit/a4cba5eea619a62d722170ff92f4324… Patch: https://github.com/kamailio/kamailio/commit/a4cba5eea619a62d722170ff92f4324…

1 0

[kamailio/kamailio] mhomed not working for tls destination (Issue #3124)
by Aidar 30 May '22

30 May '22

### Description Hello, I have faced an issue when mhomed working well only for udp destinations, and I believe that it is a bug. I have kamailio behind NAT with two network interfaces and I make a call from a softphone to kamailio and change $rd on kamailio side. If kamailio forward call to the UDP destination, mhomed option chooses the correct Via and the correct interface for sending. But if the destination is tls, mhomed chooses first described listen interface from the config file (as described in the documentation. #### The example So in my example when I call to sip:111@kamailio_ip kamailio going to send this call to $rd="1.1.1.1" and set Via and Record-Route to 10.0.0.32 (it is ok, because IP route to 1.1.1.1 via 10.0.0.32) when I call to sip:1111@kamailio_ip kamailio going to send this call to $rd="192.168.10.100:5061;transport=tls" BUT set Via and Record-Route to 10.0.0.32 (this is wrong because IP route to 192.168.10.100 is 192.168.10.145), but if in config file the first listen interface is 192.168.10.145, kamailio sends Via correct. #### Networking <img width="743" alt="image" src="https://user-images.githubusercontent.com/1487709/170417427-573f4038-b214-4…"> <img width="511" alt="image" src="https://user-images.githubusercontent.com/1487709/170417453-0a3925bf-bab4-4…"> #### Kamailio config ``` auto_aliases=yes mhomed=1 tcp_connection_match=1 # I have tried with and without this option listen=udp:10.0.0.32:5060 listen=tls:10.0.0.32:5061 listen=udp:192.168.10.145:5060 listen=tls:192.168.10.145:5061 ..... modparam("rr", "enable_full_lr", 1) modparam("rr", "append_fromtag", 1) #modparam("rr", "enable_double_rr", 2) # I have tried with and without this option ..... # routing if $rU == "111" { $rd="1.1.1.1"; } else { $rd="192.168.10.100:5061;transport=tls"; } route(RELAY); ``` #### Reproduction I have created a testing stand with almost default kamailio config so I can give full ssh access if you need it. I just call from linphone to sip:111@server_ip and sip:1111@server_ip #### SIP Traffic <img width="554" alt="image" src="https://user-images.githubusercontent.com/1487709/170420217-882d236b-243f-4…"> ``` INVITE sip:111@1.1.1.1 SIP/2.0 Record-Route: <sip:10.0.0.32;lr=on;ftag=GRIfZymtj;nat=yes> Via: SIP/2.0/UDP 10.0.0.32;branch=z9hG4bKc662.d4fa02b9991c45869263fc4359af8d84.0 Via: SIP/2.0/UDP 10.5.7.0:52360;received=210.1.88.115;branch=z9hG4bK.mH58YeIkv;rport=35775 From: <sip:akam@10.5.7.0>;tag=GRIfZymtj To: sip:111@130.61.43.152 CSeq: 20 INVITE Call-ID: FR3BLskG9- Max-Forwards: 69 Supported: replaces, outbound, gruu Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO, PRACK, UPDATE Content-Type: application/sdp Content-Length: 613 ``` <img width="584" alt="image" src="https://user-images.githubusercontent.com/1487709/170420360-a7889e57-b072-4…"> ``` INVITE sip:1111@192.168.10.100:5061;transport=tls SIP/2.0 Record-Route: <sip:10.0.0.32:5061;transport=tls;r2=on;lr=on;ftag=cIRc7nj00;nat=yes> Record-Route: <sip:10.0.0.32;r2=on;lr=on;ftag=cIRc7nj00;nat=yes> Via: SIP/2.0/TLS 10.0.0.32:5061;branch=z9hG4bK6a2.4ff69c3e304e238936a5528da681cd49.0 Via: SIP/2.0/UDP 10.5.7.0:52360;received=210.1.88.115;branch=z9hG4bK.BPohOzqtI;rport=35775 From: <sip:akam@10.5.7.0>;tag=cIRc7nj00 To: sip:1111@130.61.43.152 CSeq: 20 INVITE Call-ID: 40PEbKneY0 ``` ### Additional Information ``` root@mhomed-tls:/etc/kamailio# kamailio -v version: kamailio 5.5.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 9.3.0 ``` * **Operating System**: ``` Ubuntu 20.04.4 LTS ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3124 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3124(a)github.com>

2 2

git:master:ab8cb43c: rx_aar: unreference dialog in case of aar update (#3104)
by GitHub 30 May '22

30 May '22

Module: kamailio Branch: master Commit: ab8cb43c83f8c9528e45a5b57fbb1440360f201e URL: https://github.com/kamailio/kamailio/commit/ab8cb43c83f8c9528e45a5b57fbb144… Author: Atanas Bakalov <atanas.bakalov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-05-30T10:46:38+02:00 rx_aar: unreference dialog in case of aar update (#3104) - release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request Co-authored-by: Atanas Bakalov <atanas(a)wgtwo.com> --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/ab8cb43c83f8c9528e45a5b57fbb144… Patch: https://github.com/kamailio/kamailio/commit/ab8cb43c83f8c9528e45a5b57fbb144… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index b60f689e60..afd7ba3e74 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -180,6 +180,8 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + } else { + unref_dlg(data->dlg, 1); } result = CSCF_RETURN_TRUE; } else {

1 0

[kamailio/kamailio] ims_ipsec_pcscf: ik and ck keys expansion fixes (PR #3121)
by riccardv 30 May '22

30 May '22

Input ik,ck keys for add_sa() function are not zero terminated that cause - des3_ede encryption key expansion possible buffer overflow. Also: - sha1 authentication key expansion has been corrected.   #### 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) - [X] 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 #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3121 -- Commit Summary -- * ims_ipsec_pcscf: ik and ck keys expansion fixes -- File Changes -- M src/modules/ims_ipsec_pcscf/ipsec.c (50) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3121.patch https://github.com/kamailio/kamailio/pull/3121.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3121 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3121(a)github.com>

3 6

git:master:0a494043: ims_ipsec_pcscf: ik and ck keys expansion fixes (#3121)
by GitHub 30 May '22

30 May '22

Module: kamailio Branch: master Commit: 0a494043b70b3c5e47397f03802fe8fa79ed1fb6 URL: https://github.com/kamailio/kamailio/commit/0a494043b70b3c5e47397f03802fe8f… Author: riccardv <70984967+riccardv(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2022-05-30T10:45:26+02:00 ims_ipsec_pcscf: ik and ck keys expansion fixes (#3121) - input ik,ck keys for add_sa() are not zero terminated. - des3_ede encryption key expansion possible buffer overflow, - sha1 authentication key expansion correction. Co-authored-by: riccardv <tafkap(a)gmx.com> --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/0a494043b70b3c5e47397f03802fe8f… Patch: https://github.com/kamailio/kamailio/commit/0a494043b70b3c5e47397f03802fe8f… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 309c47a180..76c851818b 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -182,34 +182,57 @@ int add_sa(struct mnl_socket* nl_sock, const struct ip_addr *src_addr_param, con // Set the proper algorithm by r_alg str if(strncasecmp(r_alg.s, "hmac-md5-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"md5"); - } - else if(strncasecmp(r_alg.s, "hmac-sha-1-96", r_alg.len) == 0) { + l_auth_algo->alg_key_len = ik.len * 4; + string_to_key(l_auth_algo->alg_key, ik); + } else if(strncasecmp(r_alg.s, "hmac-sha-1-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"sha1"); + str ik1; + ik1.len = ik.len+8; + ik1.s = pkg_malloc (ik1.len+1); + if (ik1.s == NULL) { + LM_ERR("Error allocating memory\n"); + return -1; + } + memcpy (ik1.s,ik.s,ik.len); + ik1.s[ik.len]=0; + strcat (ik1.s,"00000000"); + l_auth_algo->alg_key_len = ik1.len * 4; + string_to_key(l_auth_algo->alg_key, ik1); + pkg_free(ik1.s); } else { - // set default algorithm to sha1 - strcpy(l_auth_algo->alg_name,"sha1"); + LM_DBG("Creating security associations: UNKNOW Auth Algorithm\n"); + return -1; } - l_auth_algo->alg_key_len = ik.len * 4; - string_to_key(l_auth_algo->alg_key, ik); - mnl_attr_put(l_nlh, XFRMA_ALG_AUTH, sizeof(struct xfrm_algo) + l_auth_algo->alg_key_len, l_auth_algo); // add encription algorithm for this SA l_enc_algo = (struct xfrm_algo *)l_enc_algo_buf; + // cipher_null, des, des3_ede, aes if (strncasecmp(r_ealg.s,"aes-cbc",r_ealg.len) == 0) { strcpy(l_enc_algo->alg_name,"aes"); l_enc_algo->alg_key_len = ck.len * 4; string_to_key(l_enc_algo->alg_key, ck); - } - else if (strncasecmp(r_ealg.s,"des-ede3-cbc",r_ealg.len) == 0) { + } else if (strncasecmp(r_ealg.s,"des-ede3-cbc",r_ealg.len) == 0) { strcpy(l_enc_algo->alg_name,"des3_ede"); - l_enc_algo->alg_key_len = ck.len * 4; - string_to_key(l_enc_algo->alg_key, ck); - } else { - // set default algorithm to null + str ck1; + ck1.len = ck.len+ck.len/2; + ck1.s = pkg_malloc (ck1.len+1); + if (ck1.s == NULL) { + LM_ERR("Error allocating memory\n"); + return -1; + } + memcpy (ck1.s,ck.s,ck.len); + memcpy (ck1.s+ck.len,ck.s,ck.len/2); + l_enc_algo->alg_key_len = ck1.len * 4; + string_to_key(l_enc_algo->alg_key, ck1); + pkg_free(ck1.s); + } else if (strncasecmp(r_ealg.s,"null",r_ealg.len) == 0) { strcpy(l_enc_algo->alg_name,"cipher_null"); - l_enc_algo->alg_key_len = 0; + l_enc_algo->alg_key_len = 0; + } else { + LM_DBG("Creating security associations: UNKNOW Enc Algorithm\n"); + return -1; } mnl_attr_put(l_nlh, XFRMA_ALG_CRYPT, sizeof(struct xfrm_algo) + l_enc_algo->alg_key_len, l_enc_algo);

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