sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
296 discussions

git:4.1:804b7f19: dtrie: sanity checks
by Stefan Mititelu 22 Jan '16

22 Jan '16

Module: kamailio Branch: 4.1 Commit: 804b7f19dc1b95f9226711125d0239574f0aa0a9 URL: https://github.com/kamailio/kamailio/commit/804b7f19dc1b95f9226711125d02395… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-22T16:50:57+02:00 dtrie: sanity checks Segfaults reported by Igor, on sr-Users mailing list. (cherry picked from commit 825b4fabb9bb4b2cf58dc1205423b8ce5d5e08cc) --- Modified: lib/trie/dtrie.c --- Diff: https://github.com/kamailio/kamailio/commit/804b7f19dc1b95f9226711125d02395… Patch: https://github.com/kamailio/kamailio/commit/804b7f19dc1b95f9226711125d02395… --- diff --git a/lib/trie/dtrie.c b/lib/trie/dtrie.c index 783f6e7..abdd589 100644 --- a/lib/trie/dtrie.c +++ b/lib/trie/dtrie.c @@ -76,7 +76,9 @@ void dtrie_delete(struct dtrie_node_t *root, struct dtrie_node_t *node, dt_delete_func_t delete_payload, const unsigned int branches) { unsigned int i; - if (node==NULL) return; + + if (node == NULL) return; + if (root == NULL) return; for (i=0; i<branches; i++) { dtrie_delete(root, node->child[i], delete_payload, branches); @@ -123,6 +125,10 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i struct dtrie_node_t *node = root; unsigned char digit, i=0; + if (node == NULL) return -1; + if (root == NULL) return -1; + if (number == NULL) return -1; + while (i<numberlen) { if (branches==10) { digit = number[i] - '0'; @@ -202,6 +208,8 @@ unsigned int dtrie_leaves(const struct dtrie_node_t *root, const unsigned int br { unsigned int i, sum = 0, leaf = 1; + if (root == NULL) return 0; + for (i=0; i<branches; i++) { if (root->child[i]) { sum += dtrie_leaves(root->child[i], branches); @@ -220,6 +228,10 @@ void **dtrie_longest_match(struct dtrie_node_t *root, const char *number, unsigned char digit, i = 0; void **ret = NULL; + if (node == NULL) return NULL; + if (root == NULL) return NULL; + if (number == NULL) return NULL; + if (nmatchptr) *nmatchptr=-1; if (node->data != NULL) { if (nmatchptr) *nmatchptr=0;

1 0

[kamailio] dtrie: sanity checks (#483)
by Stefan Mititelu 22 Jan '16

22 Jan '16

Segfaults reported by Igor, on sr-Users mailing list. Some of the output he got: ``` Jan 21 10:21:11 /usr/local/sbin/kamailio[3843]: ERROR: <core> [dtrie.c:153]: dtrie_insert(): could not allocate shared memory from available pool Jan 21 10:21:11 /usr/local/sbin/kamailio[3839]: ERROR: userblacklist [db.c:91]: db_build_userbl_tree(): could not insert values into trie. ``` Coredumps: ``` Program terminated with signal 11, Segmentation fault. #0 0x00007f13a1550af2 in dtrie_insert (root=0x7f138d7ffb38, number=0x22ba6c0 "003716716", numberlen=9, data=0x2, branches=10) at dtrie.c:141 141 if (node->child[digit] == NULL) { Core was generated by `/usr/local/sbin/kamailio -P /var/run/kamailio.pid -m 256 -M 64'. Program terminated with signal 11, Segmentation fault. #0 0x00007f13a1550af2 in dtrie_insert (root=0x7f138d7ff998, number=0x22b57a8 "0035587482", numberlen=10, data=0x2, branches=10) at dtrie.c:141 141 if (node->child[digit] == NULL) { ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/483 -- Commit Summary -- * dtrie: sanity checks -- File Changes -- M lib/trie/dtrie.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/483.patch https://github.com/kamailio/kamailio/pull/483.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/483

2 2

git:master:8ff1270b: crypto: documentation for salt parameter
by Daniel-Constantin Mierla 22 Jan '16

22 Jan '16

Module: kamailio Branch: master Commit: 8ff1270bc0a9443e9ed20016bd40bb6c27495c39 URL: https://github.com/kamailio/kamailio/commit/8ff1270bc0a9443e9ed20016bd40bb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-22T12:16:07+01:00 crypto: documentation for salt parameter --- Modified: modules/crypto/README Modified: modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8ff1270bc0a9443e9ed20016bd40bb6… Patch: https://github.com/kamailio/kamailio/commit/8ff1270bc0a9443e9ed20016bd40bb6…

1 0

git:master:ee42c43a: crypto: generate salt based on keyword for better key-based security
by Daniel-Constantin Mierla 22 Jan '16

22 Jan '16

Module: kamailio Branch: master Commit: ee42c43a2772f53d15fd721160e34e8e06297b39 URL: https://github.com/kamailio/kamailio/commit/ee42c43a2772f53d15fd721160e34e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-22T12:06:38+01:00 crypto: generate salt based on keyword for better key-based security --- Modified: modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ee42c43a2772f53d15fd721160e34e8… Patch: https://github.com/kamailio/kamailio/commit/ee42c43a2772f53d15fd721160e34e8… --- diff --git a/modules/crypto/crypto_mod.c b/modules/crypto/crypto_mod.c index 84b6239..c32e034 100644 --- a/modules/crypto/crypto_mod.c +++ b/modules/crypto/crypto_mod.c @@ -54,6 +54,9 @@ static int fixup_crypto_aes_encrypt(void** param, int param_no); static int w_crypto_aes_decrypt(sip_msg_t* msg, char* inb, char* keyb, char* outb); static int fixup_crypto_aes_decrypt(void** param, int param_no); +#define CRYPTO_SALT_BSIZE 16 +static char _crypto_salt[CRYPTO_SALT_BSIZE]; +static char *_crypto_salt_param = "k8hTm4aZ"; static cmd_export_t cmds[]={ {"crypto_aes_encrypt", (cmd_function)w_crypto_aes_encrypt, 3, @@ -64,7 +67,8 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {0, 0, 0} + { "salt", PARAM_STRING, &_crypto_salt_param }, + { 0, 0, 0 } }; struct module_exports exports = { @@ -88,6 +92,23 @@ struct module_exports exports = { */ static int mod_init(void) { + int i; + char k; + memset(_crypto_salt, 0, CRYPTO_SALT_BSIZE*sizeof(char)); + if(_crypto_salt_param==NULL || _crypto_salt_param[0]==0) { + _crypto_salt_param = NULL; + } else { + if(strlen(_crypto_salt_param)<8) { + LM_ERR("salt parameter must be at least 8 characters\n"); + return -1; + } + k = 97; + for(i=0; i<strlen(_crypto_salt_param); i++) { + if(i>=CRYPTO_SALT_BSIZE) break; + _crypto_salt[i] = (_crypto_salt_param[i]*7 + k + k*(i+1))%0xff; + k = _crypto_salt[i]; + } + } return 0; } @@ -118,7 +139,6 @@ static int w_crypto_aes_encrypt(sip_msg_t* msg, char* inb, char* keyb, char* out pv_value_t val; EVP_CIPHER_CTX en; str etext; - unsigned char salt[] = {1,2,3,4,5,6,7,8}; if (fixup_get_svalue(msg, (gparam_t*)inb, &ins) != 0) { LM_ERR("cannot get input value\n"); @@ -131,7 +151,8 @@ static int w_crypto_aes_encrypt(sip_msg_t* msg, char* inb, char* keyb, char* out dst = (pv_spec_t*)outb; /* gen key and iv. init the cipher ctx object */ - if (crypto_aes_init((unsigned char *)keys.s, keys.len, salt, &en, NULL)) { + if (crypto_aes_init((unsigned char *)keys.s, keys.len, + (unsigned char*)((_crypto_salt_param)?_crypto_salt:0), &en, NULL)) { LM_ERR("couldn't initialize AES cipher\n"); return -1; } @@ -198,7 +219,6 @@ static int w_crypto_aes_decrypt(sip_msg_t* msg, char* inb, char* keyb, char* out pv_value_t val; EVP_CIPHER_CTX de; str etext; - unsigned char salt[] = {1,2,3,4,5,6,7,8}; if (fixup_get_svalue(msg, (gparam_t*)inb, &ins) != 0) { LM_ERR("cannot get input value\n"); @@ -211,7 +231,8 @@ static int w_crypto_aes_decrypt(sip_msg_t* msg, char* inb, char* keyb, char* out dst = (pv_spec_t*)outb; /* gen key and iv. init the cipher ctx object */ - if (crypto_aes_init((unsigned char *)keys.s, keys.len, salt, NULL, &de)) { + if (crypto_aes_init((unsigned char *)keys.s, keys.len, + (unsigned char*)((_crypto_salt_param)?_crypto_salt:0), NULL, &de)) { LM_ERR("couldn't initialize AES cipher\n"); return -1; }

1 0

git:master:8dc55f2a: crypto: declare variable at top of function
by Daniel-Constantin Mierla 22 Jan '16

22 Jan '16

Module: kamailio Branch: master Commit: 8dc55f2ac2e76100993af7e13e1ebc403c2b5046 URL: https://github.com/kamailio/kamailio/commit/8dc55f2ac2e76100993af7e13e1ebc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-22T09:40:58+01:00 crypto: declare variable at top of function - declaration inside for loop is invalid in <C99 - reported by Victor Seva --- Modified: modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8dc55f2ac2e76100993af7e13e1ebc4… Patch: https://github.com/kamailio/kamailio/commit/8dc55f2ac2e76100993af7e13e1ebc4… --- diff --git a/modules/crypto/crypto_mod.c b/modules/crypto/crypto_mod.c index fdf21fe..84b6239 100644 --- a/modules/crypto/crypto_mod.c +++ b/modules/crypto/crypto_mod.c @@ -272,6 +272,7 @@ 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]; /* @@ -287,10 +288,10 @@ int crypto_aes_init(unsigned char *key_data, int key_data_len, return -1; } - for(int x = 0; x<32; ++x) + for(x = 0; x<32; ++x) LM_DBG("key: %x iv: %x \n", key[x], iv[x]); - for(int x = 0; x<8; ++x) + for(x = 0; x<8; ++x) LM_DBG("salt: %x\n", salt[x]); if(e_ctx) {

1 0

git:master:b0ec4393: statsc: new modules - statistics collector
by Daniel-Constantin Mierla 22 Jan '16

22 Jan '16

Module: kamailio Branch: master Commit: b0ec43934ac614d0fcc2a22d6a10e9117744bec5 URL: https://github.com/kamailio/kamailio/commit/b0ec43934ac614d0fcc2a22d6a10e91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-22T00:39:24+01:00 statsc: new modules - statistics collector - record the values of various statistics for a period of time, based on a timer interval and provide reports about them via rpc - reports implemented so far: - list: the recorded values - diff: the diff between values (val[T] - val[T-1]) --- Added: modules/statsc/Makefile Added: modules/statsc/README Added: modules/statsc/doc/Makefile Added: modules/statsc/doc/statsc.xml Added: modules/statsc/doc/statsc_admin.xml Added: modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b0ec43934ac614d0fcc2a22d6a10e91… Patch: https://github.com/kamailio/kamailio/commit/b0ec43934ac614d0fcc2a22d6a10e91…

1 0

git:master:d5e57d35: core: docbook - defined kamcmd entity
by Daniel-Constantin Mierla 22 Jan '16

22 Jan '16

Module: kamailio Branch: master Commit: d5e57d353b2c962902d786ef081ccf06d6a9854e URL: https://github.com/kamailio/kamailio/commit/d5e57d353b2c962902d786ef081ccf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-22T00:38:15+01:00 core: docbook - defined kamcmd entity --- Modified: docbook/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/d5e57d353b2c962902d786ef081ccf0… Patch: https://github.com/kamailio/kamailio/commit/d5e57d353b2c962902d786ef081ccf0… --- diff --git a/docbook/entities.xml b/docbook/entities.xml index 58a9a1a..bf1b952 100644 --- a/docbook/entities.xml +++ b/docbook/entities.xml @@ -13,6 +13,7 @@ <!ENTITY kamwiki "http://www.kamailio.org/wiki/"> <!ENTITY kamwikilink "<ulink url='&kamwiki;'>&kamwiki;</ulink>"> +<!ENTITY kamcmd "kamcmd"> <!ENTITY kamailiohome "http://www.kamailio.org/"> <!ENTITY kamailiobugs "http://sip-router.org/tracker">

1 0

git:master:063d5cfc: ctl: support for u specifier
by Daniel-Constantin Mierla 21 Jan '16

21 Jan '16

Module: kamailio Branch: master Commit: 063d5cfcb5cb685cd669249235be99c7cfcf1359 URL: https://github.com/kamailio/kamailio/commit/063d5cfcb5cb685cd669249235be99c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-21T23:48:22+01:00 ctl: support for u specifier --- Modified: modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/063d5cfcb5cb685cd669249235be99c… Patch: https://github.com/kamailio/kamailio/commit/063d5cfcb5cb685cd669249235be99c… --- diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index 2355a50..3b9153e 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -856,6 +856,7 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) case 'b': /* bool */ case 't': /* time */ case 'd': /* int */ + case 'u': /* uint */ v.type=autoconv?BINRPC_T_ALL:BINRPC_T_INT; ctx->in.s=binrpc_read_record(&ctx->in.ctx, ctx->in.s, ctx->in.end, &v, 0, &err); @@ -955,6 +956,7 @@ static int rpc_add(struct binrpc_ctx* ctx, char* fmt, ...) case 'd': case 't': case 'b': + case 'u': err=binrpc_addint(&ctx->out.pkt, va_arg(ap, int)); if (err<0) goto error_add; break; @@ -1061,6 +1063,7 @@ static int rpc_struct_add(struct rpc_struct_l* s, char* fmt, ...) case 'd': case 't': case 'b': + case 'u': avp.type=BINRPC_T_INT; avp.u.intval=va_arg(ap, int); break; @@ -1124,6 +1127,7 @@ static int rpc_array_add(struct rpc_struct_l* s, char* fmt, ...) case 'd': case 't': case 'b': + case 'u': err=binrpc_addint(&s->pkt, va_arg(ap, int)); if (err<0) goto error_add; break;

1 0

git:master:74f9e04c: crypto: implementation of aes decrypt function
by Daniel-Constantin Mierla 21 Jan '16

21 Jan '16

Module: kamailio Branch: master Commit: 74f9e04cff504b130fba6713613791fba093d5b4 URL: https://github.com/kamailio/kamailio/commit/74f9e04cff504b130fba6713613791f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-21T15:12:43+01:00 crypto: implementation of aes decrypt function --- Modified: modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/74f9e04cff504b130fba6713613791f… Patch: https://github.com/kamailio/kamailio/commit/74f9e04cff504b130fba6713613791f… --- diff --git a/modules/crypto/crypto_mod.c b/modules/crypto/crypto_mod.c index 9decce7..fdf21fe 100644 --- a/modules/crypto/crypto_mod.c +++ b/modules/crypto/crypto_mod.c @@ -1,5 +1,5 @@ /** - * Copyright (C) 2011 Daniel-Constantin Mierla (asipto.com) + * Copyright (C) 2016 Daniel-Constantin Mierla (asipto.com) * * This file is part of Kamailio, a free SIP server. * @@ -137,6 +137,10 @@ static int w_crypto_aes_encrypt(sip_msg_t* msg, char* inb, char* keyb, char* out } etext.len = ins.len; etext.s = (char *)crypto_aes_encrypt(&en, (unsigned char *)ins.s, &etext.len); + if(etext.s==NULL) { + LM_ERR("AES encryption failed\n"); + return -1; + } memset(&val, 0, sizeof(pv_value_t)); val.rs.s = pv_get_buffer(); @@ -188,6 +192,52 @@ static int fixup_crypto_aes_encrypt(void** param, int param_no) */ static int w_crypto_aes_decrypt(sip_msg_t* msg, char* inb, char* keyb, char* outb) { + str ins; + str keys; + pv_spec_t *dst; + pv_value_t val; + EVP_CIPHER_CTX de; + str etext; + unsigned char salt[] = {1,2,3,4,5,6,7,8}; + + if (fixup_get_svalue(msg, (gparam_t*)inb, &ins) != 0) { + LM_ERR("cannot get input value\n"); + return -1; + } + if (fixup_get_svalue(msg, (gparam_t*)keyb, &keys) != 0) { + LM_ERR("cannot get key value\n"); + return -1; + } + dst = (pv_spec_t*)outb; + + /* gen key and iv. init the cipher ctx object */ + if (crypto_aes_init((unsigned char *)keys.s, keys.len, salt, NULL, &de)) { + LM_ERR("couldn't initialize AES cipher\n"); + return -1; + } + + memset(&val, 0, sizeof(pv_value_t)); + etext.s = pv_get_buffer(); + etext.len = base64_dec((unsigned char *)ins.s, ins.len, + (unsigned char *)etext.s, pv_get_buffer_size()-1); + if (etext.len < 0) { + LM_ERR("base64 inpuy with encrypted value is too large (need %d)\n", + -etext.len); + return -1; + } + val.rs.len = etext.len; + val.rs.s = (char *)crypto_aes_decrypt(&de, (unsigned char *)etext.s, + &val.rs.len); + if(val.rs.s==NULL) { + LM_ERR("AES decryption failed\n"); + return -1; + } + LM_DBG("plain result: [%.*s]\n", val.rs.len, val.rs.s); + val.flags = PV_VAL_STR; + dst->setf(msg, &dst->pvp, (int)EQ_T, &val); + + free(val.rs.s); + EVP_CIPHER_CTX_cleanup(&de); return 1; }

1 0

git:master:e6cf3c9b: core: wheel timer advertised as secondary timer
by Daniel-Constantin Mierla 21 Jan '16

21 Jan '16

Module: kamailio Branch: master Commit: e6cf3c9bc0018f96acaa4928089273480a54582f URL: https://github.com/kamailio/kamailio/commit/e6cf3c9bc0018f96acaa49280892734… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-21T14:44:44+01:00 core: wheel timer advertised as secondary timer - safety checks when running wtimer functions --- Modified: timer_proc.c --- Diff: https://github.com/kamailio/kamailio/commit/e6cf3c9bc0018f96acaa49280892734… Patch: https://github.com/kamailio/kamailio/commit/e6cf3c9bc0018f96acaa49280892734… --- diff --git a/timer_proc.c b/timer_proc.c index a0a4c17..ed52218 100644 --- a/timer_proc.c +++ b/timer_proc.c @@ -304,7 +304,7 @@ int sr_wtimer_init(void) if(_sr_wtimer!=NULL) return 0; _sr_wtimer = (sr_wtimer_t *)pkg_malloc(sizeof(sr_wtimer_t)); - if(_sr_wtimer!=NULL) { + if(_sr_wtimer==NULL) { LM_ERR("no more pkg memory\n"); return -1; } @@ -320,7 +320,7 @@ int sr_wtimer_init(void) int sr_wtimer_add(timer_function* f, void* param, int interval) { sr_wtimer_node_t *wt; - if(_sr_wtimer!=NULL) { + if(_sr_wtimer==NULL) { LM_ERR("wtimer not intialized\n"); return -1; } @@ -351,7 +351,7 @@ void sr_wtimer_exec(unsigned int ticks, void *param) uint32_t i; uint32_t c; - if(_sr_wtimer!=NULL) { + if(_sr_wtimer==NULL) { LM_ERR("wtimer not intialized\n"); return; } @@ -376,12 +376,12 @@ void sr_wtimer_exec(unsigned int ticks, void *param) */ int sr_wtimer_start(void) { - if(_sr_wtimer!=NULL) { + if(_sr_wtimer==NULL) { LM_ERR("wtimer not intialized\n"); return -1; } - if(fork_sync_timer(-1 /*PROC_TIMER*/, "WTIMER", 1, + if(fork_sync_timer(-1 /*PROC_TIMER*/, "secondary timer", 1, sr_wtimer_exec, NULL, 1)<0) { LM_ERR("wtimer starting failed\n"); return -1;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016