sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
361 discussions

git:master:97ba02b0: crypto: docs for netio params, functions and event route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 97ba02b003f8f4545376fffbf17cdf600abd6b60 URL: https://github.com/kamailio/kamailio/commit/97ba02b003f8f4545376fffbf17cdf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T11:05:49+02:00 crypto: docs for netio params, functions and event route --- Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97ba02b003f8f4545376fffbf17cdf6… Patch: https://github.com/kamailio/kamailio/commit/97ba02b003f8f4545376fffbf17cdf6…

3 years

git:master:d65e15a4: crypto: coherent naming for functions on netio event handling

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d65e15a461197a9302d1cccc6fe3069d9432e268 URL: https://github.com/kamailio/kamailio/commit/d65e15a461197a9302d1cccc6fe3069… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T11:05:26+02:00 crypto: coherent naming for functions on netio event handling --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d65e15a461197a9302d1cccc6fe3069… Patch: https://github.com/kamailio/kamailio/commit/d65e15a461197a9302d1cccc6fe3069… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index c2ae77fb6b..c2f7fe61e4 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -74,13 +74,13 @@ static cmd_export_t cmds[]={ fixup_crypto_aes_encrypt, 0, ANY_ROUTE}, {"crypto_aes_decrypt", (cmd_function)w_crypto_aes_decrypt, 3, fixup_crypto_aes_decrypt, 0, ANY_ROUTE}, - {"crypto_nio_in", (cmd_function)w_crypto_nio_in, 0, + {"crypto_netio_in", (cmd_function)w_crypto_nio_in, 0, 0, 0, ANY_ROUTE}, - {"crypto_nio_out", (cmd_function)w_crypto_nio_out, 0, + {"crypto_netio_out", (cmd_function)w_crypto_nio_out, 0, 0, 0, ANY_ROUTE}, - {"crypto_nio_encrypt", (cmd_function)w_crypto_nio_encrypt, 0, + {"crypto_netio_encrypt", (cmd_function)w_crypto_nio_encrypt, 0, 0, 0, ANY_ROUTE}, - {"crypto_nio_decrypt", (cmd_function)w_crypto_nio_decrypt, 0, + {"crypto_netio_decrypt", (cmd_function)w_crypto_nio_decrypt, 0, 0, 0, ANY_ROUTE}, {"load_crypto", (cmd_function)load_crypto, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}

3 years

git:master:6f7b04d6: crypto: aes encrypt/decrypt based on event_route[crypto:netio]

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6f7b04d62e555dbbfb6360623c4c2ab84a36e2e7 URL: https://github.com/kamailio/kamailio/commit/6f7b04d62e555dbbfb6360623c4c2ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T10:35:18+02:00 crypto: aes encrypt/decrypt based on event_route[crypto:netio] --- Modified: src/modules/crypto/crypto_aes.c Modified: src/modules/crypto/crypto_aes.h Modified: src/modules/crypto/crypto_evcb.c Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f7b04d62e555dbbfb6360623c4c2ab… Patch: https://github.com/kamailio/kamailio/commit/6f7b04d62e555dbbfb6360623c4c2ab…

3 years

git:master:40d92899: crypto: saved functions in crypto_aes.c

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 40d9289977b97becc4d4bd948bcde57ea320cf0e URL: https://github.com/kamailio/kamailio/commit/40d9289977b97becc4d4bd948bcde57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T07:57:34+02:00 crypto: saved functions in crypto_aes.c --- Modified: src/modules/crypto/crypto_aes.c --- Diff: https://github.com/kamailio/kamailio/commit/40d9289977b97becc4d4bd948bcde57… Patch: https://github.com/kamailio/kamailio/commit/40d9289977b97becc4d4bd948bcde57… --- diff --git a/src/modules/crypto/crypto_aes.c b/src/modules/crypto/crypto_aes.c index 9573c7264d..777d43502b 100644 --- a/src/modules/crypto/crypto_aes.c +++ b/src/modules/crypto/crypto_aes.c @@ -19,3 +19,122 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * Create an 256 bit key and IV using the supplied key_data and salt. + * Fills in the encryption and decryption ctx objects and returns 0 on success + */ +int crypto_aes_init(unsigned char *key_data, int key_data_len, + unsigned char *salt, EVP_CIPHER_CTX *e_ctx, EVP_CIPHER_CTX *d_ctx) +{ + int i, nrounds = 5; + int x; + unsigned char key[32], iv[32]; + + /* + * Gen key & IV for AES 256 CBC mode. A SHA1 digest is used to hash + * the supplied key material. + * nrounds is the number of times the we hash the material. More rounds + * are more secure but slower. + */ + i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha1(), salt, + key_data, key_data_len, nrounds, key, iv); + if (i != 32) { + LM_ERR("key size is %d bits - should be 256 bits\n", i); + return -1; + } + + for(x = 0; x<32; ++x) + LM_DBG("key: %x iv: %x \n", key[x], iv[x]); + + for(x = 0; x<8; ++x) + LM_DBG("salt: %x\n", salt[x]); + + if(e_ctx) { + EVP_CIPHER_CTX_init(e_ctx); + EVP_EncryptInit_ex(e_ctx, EVP_aes_256_cbc(), NULL, key, iv); + } + if(d_ctx) { + EVP_CIPHER_CTX_init(d_ctx); + EVP_DecryptInit_ex(d_ctx, EVP_aes_256_cbc(), NULL, key, iv); + } + + return 0; +} + +/* + * Encrypt *len bytes of data + * All data going in & out is considered binary (unsigned char[]) + */ +unsigned char *crypto_aes_encrypt(EVP_CIPHER_CTX *e, unsigned char *plaintext, + int *len) +{ + /* max ciphertext len for a n bytes of plaintext is + * n + AES_BLOCK_SIZE -1 bytes */ + int c_len = *len + AES_BLOCK_SIZE - 1, f_len = 0; + unsigned char *ciphertext = (unsigned char *)malloc(c_len); + + if(ciphertext == NULL) { + LM_ERR("no more system memory\n"); + return NULL; + } + /* allows reusing of 'e' for multiple encryption cycles */ + if(!EVP_EncryptInit_ex(e, NULL, NULL, NULL, NULL)){ + LM_ERR("failure in EVP_EncryptInit_ex \n"); + free(ciphertext); + return NULL; + } + + /* update ciphertext, c_len is filled with the length of ciphertext + * generated, *len is the size of plaintext in bytes */ + if(!EVP_EncryptUpdate(e, ciphertext, &c_len, plaintext, *len)){ + LM_ERR("failure in EVP_EncryptUpdate \n"); + free(ciphertext); + return NULL; + } + + /* update ciphertext with the final remaining bytes */ + if(!EVP_EncryptFinal_ex(e, ciphertext+c_len, &f_len)){ + LM_ERR("failure in EVP_EncryptFinal_ex \n"); + free(ciphertext); + return NULL; + } + + *len = c_len + f_len; + return ciphertext; +} + +/* + * Decrypt *len bytes of ciphertext + */ +unsigned char *crypto_aes_decrypt(EVP_CIPHER_CTX *e, unsigned char *ciphertext, + int *len) +{ + /* plaintext will always be equal to or lesser than length of ciphertext*/ + int p_len = *len, f_len = 0; + unsigned char *plaintext = (unsigned char *)malloc(p_len); + + if(plaintext==NULL) { + LM_ERR("no more system memory\n"); + return NULL; + } + if(!EVP_DecryptInit_ex(e, NULL, NULL, NULL, NULL)){ + LM_ERR("failure in EVP_DecryptInit_ex \n"); + free(plaintext); + return NULL; + } + + if(!EVP_DecryptUpdate(e, plaintext, &p_len, ciphertext, *len)){ + LM_ERR("failure in EVP_DecryptUpdate\n"); + free(plaintext); + return NULL; + } + + if(!EVP_DecryptFinal_ex(e, plaintext+p_len, &f_len)){ + LM_ERR("failure in EVP_DecryptFinal_ex\n"); + free(plaintext); + return NULL; + } + + *len = p_len + f_len; + return plaintext; +} \ No newline at end of file

3 years

[kamailio/kamailio] Play media when Kamailio+rtpengine are as an end point(not proxy) (#2315)

by bshirazi

### Description  With rtpengine module play_media function it is possible to play media to one of the endpoints(Kamailio is normal proxy) but I like to use Kamailio+rtpengine as an end point playing music for caller(simple media server). ### Expected behavior Possible to use Kamailio+rtpengine as an end point playing media. ### Possible Solutions I see some efforts in mailing list trying to build/generate a 183 response inside script to simulate a dummy end point and then use rtpengine_play_media function.  Regards. Babak -- 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/2315

3 years

git:master:70fc8569: crypto: set flags to encrypt/decrypt and functions for direction

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 70fc8569559abd80336ad1ddcd5a0676f9665d11 URL: https://github.com/kamailio/kamailio/commit/70fc8569559abd80336ad1ddcd5a067… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T20:21:09+02:00 crypto: set flags to encrypt/decrypt and functions for direction --- Modified: src/modules/crypto/crypto_evcb.c Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/70fc8569559abd80336ad1ddcd5a067… Patch: https://github.com/kamailio/kamailio/commit/70fc8569559abd80336ad1ddcd5a067…

3 years

git:master:7cc8eca1: crypto: set flags to encrypt/decrypt on event route functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7cc8eca1d06ada4e4b819e3d061850eddc8a58ed URL: https://github.com/kamailio/kamailio/commit/7cc8eca1d06ada4e4b819e3d061850e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T09:40:59+02:00 crypto: set flags to encrypt/decrypt on event route functions --- Modified: src/modules/crypto/crypto_evcb.c --- Diff: https://github.com/kamailio/kamailio/commit/7cc8eca1d06ada4e4b819e3d061850e… Patch: https://github.com/kamailio/kamailio/commit/7cc8eca1d06ada4e4b819e3d061850e… --- diff --git a/src/modules/crypto/crypto_evcb.c b/src/modules/crypto/crypto_evcb.c index dd23d0d0fd..3a79a63523 100644 --- a/src/modules/crypto/crypto_evcb.c +++ b/src/modules/crypto/crypto_evcb.c @@ -31,6 +31,7 @@ #include "../../core/kemi.h" #include "../../core/fmsg.h" #include "../../core/events.h" +#include "../../core/onsend.h" #define CRYPTO_NIO_OUT (1<<0) @@ -92,6 +93,7 @@ int crypto_exec_evroute(crypto_env_t *evenv, int rt, str *kevcb, str *rtname) sip_msg_t *fmsg; sip_msg_t tmsg; sr_kemi_eng_t *keng = NULL; + onsend_info_t onsnd_info = {0}; if(evenv==0) { LM_ERR("crypto env not set\n"); @@ -107,6 +109,16 @@ int crypto_exec_evroute(crypto_env_t *evenv, int rt, str *kevcb, str *rtname) return -1; } fmsg = &tmsg; + + if(evenv->mflags & CRYPTO_NIO_OUT) { + onsnd_info.to = &evenv->evp->dst->to; + onsnd_info.send_sock = evenv->evp->dst->send_sock; + onsnd_info.buf = fmsg->buf; + onsnd_info.len = fmsg->len; + onsnd_info.msg = fmsg; + p_onsend = &onsnd_info; + } + crypto_set_msg_env(fmsg, evenv); backup_rt = get_route_type(); set_route_type(EVENT_ROUTE); @@ -125,6 +137,10 @@ int crypto_exec_evroute(crypto_env_t *evenv, int rt, str *kevcb, str *rtname) crypto_set_msg_env(fmsg, NULL); /* free the structure -- it is a clone of faked msg */ free_sip_msg(fmsg); + + if(evenv->mflags & CRYPTO_NIO_OUT) { + p_onsend = NULL; + } return 0; } @@ -174,6 +190,13 @@ int crypto_nio_sent(sr_event_param_t *evp) */ int crypto_nio_in(sip_msg_t* msg) { + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + if(evenv->mflags & CRYPTO_NIO_OUT) { + return -1; + } + return 1; } @@ -182,7 +205,14 @@ int crypto_nio_in(sip_msg_t* msg) */ int crypto_nio_out(sip_msg_t* msg) { - return 1; + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + if(evenv->mflags & CRYPTO_NIO_OUT) { + return 1; + } + + return -1; } /** @@ -190,6 +220,12 @@ int crypto_nio_out(sip_msg_t* msg) */ int crypto_nio_encrypt(sip_msg_t* msg) { + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + + evenv->mflags |= CRYPTO_NIO_ENCRYPT; + return 1; } @@ -198,5 +234,11 @@ int crypto_nio_encrypt(sip_msg_t* msg) */ int crypto_nio_decrypt(sip_msg_t* msg) { + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + + evenv->mflags |= CRYPTO_NIO_DECRYPT; + return 1; } \ No newline at end of file

3 years

git:master:dd15786a: crypto: aes helper functions relocated to dedicated files

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dd15786aba0b48a83efeef258d689217ac5375a9 URL: https://github.com/kamailio/kamailio/commit/dd15786aba0b48a83efeef258d68921… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T13:10:29+02:00 crypto: aes helper functions relocated to dedicated files --- Added: src/modules/crypto/crypto_aes.c Added: src/modules/crypto/crypto_aes.h --- Diff: https://github.com/kamailio/kamailio/commit/dd15786aba0b48a83efeef258d68921… Patch: https://github.com/kamailio/kamailio/commit/dd15786aba0b48a83efeef258d68921… --- diff --git a/src/modules/crypto/crypto_aes.c b/src/modules/crypto/crypto_aes.c new file mode 100644 index 0000000000..9573c7264d --- /dev/null +++ b/src/modules/crypto/crypto_aes.c @@ -0,0 +1,21 @@ +/** + * Copyright (C) 2016-2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + diff --git a/src/modules/crypto/crypto_aes.h b/src/modules/crypto/crypto_aes.h new file mode 100644 index 0000000000..a98a95016e --- /dev/null +++ b/src/modules/crypto/crypto_aes.h @@ -0,0 +1,35 @@ +/** + * Copyright (C) 2016-2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _CRYPTO_AES_H_ +#define _CRYPTO_AES_H_ + +#include <openssl/evp.h> + +int crypto_aes_init(unsigned char *key_data, int key_data_len, + unsigned char *salt, EVP_CIPHER_CTX *e_ctx, EVP_CIPHER_CTX *d_ctx); + +unsigned char *crypto_aes_encrypt(EVP_CIPHER_CTX *e, unsigned char *plaintext, + int *len); + +unsigned char *crypto_aes_decrypt(EVP_CIPHER_CTX *e, unsigned char *ciphertext, + int *len); +#endif \ No newline at end of file

3 years

git:master:52f9c668: pv: new var $mts - return msg type as string

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 52f9c668d77746383d8fdae6e90fabd6c7a018fa URL: https://github.com/kamailio/kamailio/commit/52f9c668d77746383d8fdae6e90fabd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T09:21:25+02:00 pv: new var $mts - return msg type as string - rq - for request - rp - for response --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/52f9c668d77746383d8fdae6e90fabd… Patch: https://github.com/kamailio/kamailio/commit/52f9c668d77746383d8fdae6e90fabd… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 492344f80e..0308514e70 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -293,6 +293,9 @@ static pv_export_t mod_pvs[] = { {{"mt", (sizeof("mt")-1)}, /* */ PVT_OTHER, pv_get_msgtype, 0, 0, 0, 0, 0}, + {{"mts", (sizeof("mts")-1)}, /* */ + PVT_OTHER, pv_get_msgtypes, 0, + 0, 0, 0, 0}, {{"od", (sizeof("od")-1)}, /* */ PVT_OTHER, pv_get_ouri_attr, 0, 0, 0, pv_init_iname, 2}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5a83a8999b..e53db70c25 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -195,6 +195,23 @@ int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, type); } +int pv_get_msgtypes(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + char *types = "xx"; + + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REQUEST) { + types = "rq"; + } else if(msg->first_line.type == SIP_REPLY) { + types = "rp"; + } + + return pv_get_strzval(msg, param, res, types); +} + int pv_get_version(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 919fa3910f..cf87a7e0c9 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -49,6 +49,9 @@ int pv_get_methodid(struct sip_msg *msg, pv_param_t *param, int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_msgtypes(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

3 years

git:master:f658a7a8: pv: removed commented code for retcode var - exported from core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f658a7a8263efd4b0ed5816959741380a964221d URL: https://github.com/kamailio/kamailio/commit/f658a7a8263efd4b0ed581695974138… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-31T09:30:13+02:00 pv: removed commented code for retcode var - exported from core --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/f658a7a8263efd4b0ed581695974138… Patch: https://github.com/kamailio/kamailio/commit/f658a7a8263efd4b0ed581695974138… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 7f478a9ac5..492344f80e 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -338,12 +338,6 @@ static pv_export_t mod_pvs[] = { {{"rb", (sizeof("rb")-1)}, /* */ PVT_MSG_BODY, pv_get_msg_body, 0, 0, 0, 0, 0}, - /* {{"rc", (sizeof("rc")-1)}, - PVT_OTHER, pv_get_return_code, 0, - 0, 0, 0, 0}, - {{"retcode", (sizeof("retcode")-1)}, - PVT_OTHER, pv_get_return_code, 0, - 0, 0, 0, 0}, */ {{"rd", (sizeof("rd")-1)}, /* */ PVT_RURI_DOMAIN, pv_get_ruri_attr, pv_set_ruri_host, 0, 0, pv_init_iname, 2},

3 years

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020