sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

git:master:43871e4a: Merge pull request #832 from zecke/pv/use-memcpy-for-bytes

by GitHub

Module: kamailio Branch: master Commit: 43871e4a81afc2ee1ce43b8224809dc11fe61c37 URL: https://github.com/kamailio/kamailio/commit/43871e4a81afc2ee1ce43b8224809dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-10-28T12:04:45+02:00 Merge pull request #832 from zecke/pv/use-memcpy-for-bytes pv: Use memcpy to copy len bytes instead of strcpy --- Modified: modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/43871e4a81afc2ee1ce43b8224809dc… Patch: https://github.com/kamailio/kamailio/commit/43871e4a81afc2ee1ce43b8224809dc… --- diff --git a/modules/pv/pv_svar.c b/modules/pv/pv_svar.c index 3b4c710..ae22db1 100644 --- a/modules/pv/pv_svar.c +++ b/modules/pv/pv_svar.c @@ -70,7 +70,7 @@ script_var_t* add_var(str *name, int vtype) return 0; } it->name.len = name->len; - strncpy(it->name.s, name->s, name->len); + memcpy(it->name.s, name->s, name->len); it->name.s[it->name.len] = '\0'; if(vtype==VAR_TYPE_NULL) { @@ -133,7 +133,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) } var->v.flags |= VAR_VAL_STR; } - strncpy(var->v.value.s.s, value->s.s, value->s.len); + memcpy(var->v.value.s.s, value->s.s, value->s.len); var->v.value.s.len = value->s.len; var->v.value.s.s[value->s.len] = '\0'; } else {

7 years, 9 months

git:master:2531dd06: pv: Use memcpy to copy len bytes instead of strcpy

by Holger Hans Peter Freyther

Module: kamailio Branch: master Commit: 2531dd069bc76f945c5c19253e35fe8b1ef9ed15 URL: https://github.com/kamailio/kamailio/commit/2531dd069bc76f945c5c19253e35fe8… Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Committer: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: 2016-10-25T23:01:14+02:00 pv: Use memcpy to copy len bytes instead of strcpy The sipcapture plugin stores bytes with VAR_VAL_STR and when copying the data it would end up being truncated. Use memcpy instead of strncpy and assume that the original string already has the NUL termination (or not as with the hep plugin). Config example: $var(payload) = hep(0x00f) --- Modified: modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/2531dd069bc76f945c5c19253e35fe8… Patch: https://github.com/kamailio/kamailio/commit/2531dd069bc76f945c5c19253e35fe8… --- diff --git a/modules/pv/pv_svar.c b/modules/pv/pv_svar.c index 3b4c710..ae22db1 100644 --- a/modules/pv/pv_svar.c +++ b/modules/pv/pv_svar.c @@ -70,7 +70,7 @@ script_var_t* add_var(str *name, int vtype) return 0; } it->name.len = name->len; - strncpy(it->name.s, name->s, name->len); + memcpy(it->name.s, name->s, name->len); it->name.s[it->name.len] = '\0'; if(vtype==VAR_TYPE_NULL) { @@ -133,7 +133,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) } var->v.flags |= VAR_VAL_STR; } - strncpy(var->v.value.s.s, value->s.s, value->s.len); + memcpy(var->v.value.s.s, value->s.s, value->s.len); var->v.value.s.len = value->s.len; var->v.value.s.s[value->s.len] = '\0'; } else {

7 years, 9 months

Missing brackets in pseudo variable for IPv6

by M S

Hi, I am using Kamailio v4.4.2 revision 892ad6 on Debian wheezy 32bit platform. The machine has public IPv6 and IPv4 addresses and Kamailio is listening on both of them. The problem is that kamailio pseudo variables such as $si, $du, $ct etc. when contain an IPv6 address, they are not enclosed in square brackets i.e. "[" and "]". Which creates many problems in writing route script (kamailio.cfg) and I have to manually check for IPv6 address and if matched add these square brackets. For example, $si returns 2A01:X35:2X71:X02:490X:DDF:61X5:B5X1 but it should return [2A01:X35:2X71:X02:490X:DDF:61X5:B5X1] instead. similarly, $du returns sip:2A01:X35:2X71:X02:490X:DDF:61X5:B5X1:35670;transport=ws which fails and gives this error, ERROR: tm [ut.h:254]: uri2dst2(): ERROR: uri2dst: bad_uri: sip:2A01:X35:2X71:X02:490X:DDF:61X5:B5X1:35670;transport=ws it should instead return, sip:[2A01:X35:2X71:X02:490X:DDF:61X5:B5X1]:35670;transport=ws and so on. Can we have these brackets for IPv6 addresses everywhere by default? This will make script writer's life a lot easier. Thank you.

7 years, 9 months

git:master:6abca01c: permissions: README file regenerated

by Ovidiu Sas

Module: kamailio Branch: master Commit: 6abca01c09b39f72120892ec90b426a445fbae86 URL: https://github.com/kamailio/kamailio/commit/6abca01c09b39f72120892ec90b426a… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2016-10-27T13:00:17-04:00 permissions: README file regenerated --- Modified: modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/6abca01c09b39f72120892ec90b426a… Patch: https://github.com/kamailio/kamailio/commit/6abca01c09b39f72120892ec90b426a…

7 years, 9 months

[kamailio/kamailio] [4.4] tls: FTB with new openssl 1.1.0 (#834)

by Victor Seva

Even with ``` commit b29217e8036ead0d09c52616000d6b68d4512f86 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 15 19:33:04 2016 +0200 auth_identity: still use ASN1_STRING_data() for libssl < v1.1.0 - from libssl v1.1.0, ASN1_STRING_data() is deprecated, but before it doesn't exist - reported by Victor Seva, GH #685 (cherry picked from commit 8a46f415fb13b76fa3b071eecd7dc0401f99759e) commit 0f2a129e4f1790f8d6502ac224b480d60126fb09 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 15 16:30:30 2016 +0200 auth_identity: switched to use pointer of X509_STORE_CTX - starting with libssl 1.1.0 the size of X509_STORE_CTX is not known at compile time, throwing error: error: storage size of 'ca_ctx' isn't known X509_STORE_CTX ca_ctx; - reported by Victor Seva, GH #685 (cherry picked from commit 46f0f1c0f492c45c1b1bbcfd4a0cc63eb56480ea) ``` ``` apt-cache policy libssl-dev libssl-dev: Installed: 1.1.0b-1 Candidate: 1.1.0b-1 Version table: *** 1.1.0b-1 100 100 /var/lib/dpkg/status ``` ``` every-module group_include=ktls Makefile:56: modules.lst: No such file or directory Makefile:107: config.mak: No such file or directory target architecture <x86_64>, host architecture <x86_64> making config... saving modules list... CC (gcc) [M auth_identity.so] auth_http.o CC (gcc) [M auth_identity.so] auth_hdrs.o CC (gcc) [M auth_identity.so] auth_tables.o CC (gcc) [M auth_identity.so] auth_identity.o CC (gcc) [M auth_identity.so] auth_crypt.o CC (gcc) [M auth_identity.so] auth_dynstr.o LD (gcc) [M auth_identity.so] auth_identity.so CC (gcc) [M crypto.so] crypto_uuid.o CC (gcc) [M crypto.so] crypto_mod.o crypto_mod.c: In function 'w_crypto_aes_encrypt': crypto_mod.c:161:17: error: storage size of 'en' isn't known EVP_CIPHER_CTX en; ^~ crypto_mod.c:161:17: warning: unused variable 'en' [-Wunused-variable] crypto_mod.c: In function 'w_crypto_aes_decrypt': crypto_mod.c:241:17: error: storage size of 'de' isn't known EVP_CIPHER_CTX de; ^~ crypto_mod.c:241:17: warning: unused variable 'de' [-Wunused-variable] crypto_mod.c: In function 'crypto_aes_test': crypto_mod.c:436:17: error: storage size of 'en' isn't known EVP_CIPHER_CTX en, de; ^~ crypto_mod.c:436:21: error: storage size of 'de' isn't known EVP_CIPHER_CTX en, de; ^~ crypto_mod.c:436:21: warning: unused variable 'de' [-Wunused-variable] crypto_mod.c:436:17: warning: unused variable 'en' [-Wunused-variable] EVP_CIPHER_CTX en, de; ^~ ../../Makefile.rules:97: recipe for target 'crypto_mod.o' failed make[1]: *** [crypto_mod.o] Error 1 Makefile:511: recipe for target 'modules' failed make: *** [modules] Error 1 ``` -- 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/834

7 years, 9 months

git:4.4:81df84b8: tls: updated bio functions to support libssl v1.1.0 api

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 81df84b840bcb053400063f5b96d3d84179b11c5 URL: https://github.com/kamailio/kamailio/commit/81df84b840bcb053400063f5b96d3d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-27T17:04:13+02:00 tls: updated bio functions to support libssl v1.1.0 api (cherry picked from commit fe99687608929b19be62412c334cf41e84845f81) --- Modified: modules/tls/tls_bio.c --- Diff: https://github.com/kamailio/kamailio/commit/81df84b840bcb053400063f5b96d3d8… Patch: https://github.com/kamailio/kamailio/commit/81df84b840bcb053400063f5b96d3d8… --- diff --git a/modules/tls/tls_bio.c b/modules/tls/tls_bio.c index d2c2107..b0aae5b 100644 --- a/modules/tls/tls_bio.c +++ b/modules/tls/tls_bio.c @@ -1,4 +1,4 @@ -/* +/* * Kamailio TLS module * * Copyright (C) 2010 iptelorg GmbH @@ -137,14 +137,22 @@ int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr) struct tls_bio_mbuf_data* d; TLS_BIO_DBG("tls_BIO_mbuf_set called (%p => %p, %p)\n", b, rd, wr); - if (unlikely(b->ptr == 0)){ - BUG("null BIO ptr\n"); +#if OPENSSL_VERSION_NUMBER < 0x010100000L + d = b->ptr; +#else + d = BIO_get_data(b); +#endif + if (unlikely(d == 0)){ + BUG("null BIO ptr data\n"); return 0; } - d = b->ptr; d->rd = rd; d->wr = wr; +#if OPENSSL_VERSION_NUMBER < 0x010100000L b->init = 1; +#else + BIO_set_init(b, 1); +#endif return 1; } @@ -157,8 +165,9 @@ int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr) static int tls_bio_mbuf_new(BIO* b) { struct tls_bio_mbuf_data* d; - + TLS_BIO_DBG("tls_bio_mbuf_new called (%p)\n", b); +#if OPENSSL_VERSION_NUMBER < 0x010100000L b->init = 0; /* not initialized yet */ b->num = 0; b->ptr = 0; @@ -169,6 +178,14 @@ static int tls_bio_mbuf_new(BIO* b) d->rd = 0; d->wr = 0; b->ptr = d; +#else + BIO_set_init(b, 0); + BIO_set_data(b, NULL); + d = OPENSSL_zalloc(sizeof(*d)); + if (unlikely(d == 0)) + return 0; + BIO_set_data(b, d); +#endif return 1; } @@ -183,11 +200,23 @@ static int tls_bio_mbuf_free(BIO* b) TLS_BIO_DBG("tls_bio_mbuf_free called (%p)\n", b); if (unlikely( b == 0)) return 0; +#if OPENSSL_VERSION_NUMBER < 0x010100000L if (likely(b->ptr)){ OPENSSL_free(b->ptr); b->ptr = 0; b->init = 0; } +#else + do { + struct tls_bio_mbuf_data* d; + d = BIO_get_data(b); + if (likely(d)) { + OPENSSL_free(d); + BIO_set_data(b, NULL); + BIO_set_init(b, 0); + } + } while(0); +#endif return 1; } @@ -203,10 +232,14 @@ static int tls_bio_mbuf_read(BIO* b, char* dst, int dst_len) struct tls_bio_mbuf_data* d; struct tls_mbuf* rd; int ret; - + ret = 0; if (likely(dst)) { - d= b->ptr; +#if OPENSSL_VERSION_NUMBER < 0x010100000L + d = b->ptr; +#else + d = BIO_get_data(b); +#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->rd->buf == 0)) { if (d == 0) @@ -256,9 +289,13 @@ static int tls_bio_mbuf_write(BIO* b, const char* src, int src_len) struct tls_bio_mbuf_data* d; struct tls_mbuf* wr; int ret; - + ret = 0; - d= b->ptr; +#if OPENSSL_VERSION_NUMBER < 0x010100000L + d = b->ptr; +#else + d = BIO_get_data(b); +#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->wr->buf == 0)) { if (d == 0) @@ -330,12 +367,10 @@ static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2) static int tls_bio_mbuf_puts(BIO* b, const char* s) { int len; - + TLS_BIO_DBG("puts called (%p, %s)\n", b, s); len=strlen(s); return tls_bio_mbuf_write(b, s, len); } - - /* vi: set ts=4 sw=4 tw=79:ai:cindent: */

7 years, 9 months

git:4.4:58daa315: tls: updates for compatibilty with libssl v1.1.0 api

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 58daa3156bd4d22fa18ca00c99a99c426eeb76b1 URL: https://github.com/kamailio/kamailio/commit/58daa3156bd4d22fa18ca00c99a99c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-27T17:04:01+02:00 tls: updates for compatibilty with libssl v1.1.0 api (cherry picked from commit ef021552162e281c694a4f4b420aa1c642db5066) --- Modified: modules/tls/tls_bio.c Modified: modules/tls/tls_domain.c Modified: modules/tls/tls_init.c Modified: modules/tls/tls_server.c Modified: modules/tls/tls_verify.c --- Diff: https://github.com/kamailio/kamailio/commit/58daa3156bd4d22fa18ca00c99a99c4… Patch: https://github.com/kamailio/kamailio/commit/58daa3156bd4d22fa18ca00c99a99c4…

7 years, 9 months

git:4.4:f97df2e6: crypto: updated to be compatible with api from libssl v1.1.0

by Victor Seva

Module: kamailio Branch: 4.4 Commit: f97df2e6d4b9c721c97bcbd3b5930530604a127a URL: https://github.com/kamailio/kamailio/commit/f97df2e6d4b9c721c97bcbd3b593053… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-27T16:59:12+02:00 crypto: updated to be compatible with api from libssl v1.1.0 (cherry picked from commit 8d83571658471f162e35cb54ba7e3baecbe7970d) --- Modified: modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f97df2e6d4b9c721c97bcbd3b593053… Patch: https://github.com/kamailio/kamailio/commit/f97df2e6d4b9c721c97bcbd3b593053…

7 years, 9 months

git:4.4:b29217e8: auth_identity: still use ASN1_STRING_data() for libssl < v1.1.0

by Victor Seva

Module: kamailio Branch: 4.4 Commit: b29217e8036ead0d09c52616000d6b68d4512f86 URL: https://github.com/kamailio/kamailio/commit/b29217e8036ead0d09c52616000d6b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-27T16:34:39+02:00 auth_identity: still use ASN1_STRING_data() for libssl < v1.1.0 - from libssl v1.1.0, ASN1_STRING_data() is deprecated, but before it doesn't exist - reported by Victor Seva, GH #685 (cherry picked from commit 8a46f415fb13b76fa3b071eecd7dc0401f99759e) --- Modified: modules/auth_identity/auth_crypt.c --- Diff: https://github.com/kamailio/kamailio/commit/b29217e8036ead0d09c52616000d6b6… Patch: https://github.com/kamailio/kamailio/commit/b29217e8036ead0d09c52616000d6b6… --- diff --git a/modules/auth_identity/auth_crypt.c b/modules/auth_identity/auth_crypt.c index dbb0957..f9b40e6 100644 --- a/modules/auth_identity/auth_crypt.c +++ b/modules/auth_identity/auth_crypt.c @@ -116,7 +116,11 @@ int check_x509_subj(X509 *pcert, str* sdom) if (actname->type == GEN_DNS || actname->type == GEN_URI) { /* we've found one */ +#if OPENSSL_VERSION_NUMBER >= 0x010100000L altptr = (char *)ASN1_STRING_get0_data(actname->d.ia5); +#else + altptr = (char *)ASN1_STRING_data(actname->d.ia5); +#endif if (actname->type == GEN_URI) { if (parse_uri(altptr, strlen(altptr), &suri) != 0) { continue;

7 years, 9 months

git:4.4:0f2a129e: auth_identity: switched to use pointer of X509_STORE_CTX

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 0f2a129e4f1790f8d6502ac224b480d60126fb09 URL: https://github.com/kamailio/kamailio/commit/0f2a129e4f1790f8d6502ac224b480d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-27T16:34:27+02:00 auth_identity: switched to use pointer of X509_STORE_CTX - starting with libssl 1.1.0 the size of X509_STORE_CTX is not known at compile time, throwing error: error: storage size of 'ca_ctx' isn't known X509_STORE_CTX ca_ctx; - reported by Victor Seva, GH #685 (cherry picked from commit 46f0f1c0f492c45c1b1bbcfd4a0cc63eb56480ea) --- Modified: modules/auth_identity/auth_crypt.c --- Diff: https://github.com/kamailio/kamailio/commit/0f2a129e4f1790f8d6502ac224b480d… Patch: https://github.com/kamailio/kamailio/commit/0f2a129e4f1790f8d6502ac224b480d… --- diff --git a/modules/auth_identity/auth_crypt.c b/modules/auth_identity/auth_crypt.c index de5b03d..dbb0957 100644 --- a/modules/auth_identity/auth_crypt.c +++ b/modules/auth_identity/auth_crypt.c @@ -37,6 +37,7 @@ #include <openssl/sha.h> #include <openssl/x509.h> #include <openssl/x509v3.h> +#include <openssl/crypto.h> #include <openssl/x509_vfy.h> #include "../../mem/mem.h" @@ -115,7 +116,7 @@ int check_x509_subj(X509 *pcert, str* sdom) if (actname->type == GEN_DNS || actname->type == GEN_URI) { /* we've found one */ - altptr = (char *)ASN1_STRING_data(actname->d.ia5); + altptr = (char *)ASN1_STRING_get0_data(actname->d.ia5); if (actname->type == GEN_URI) { if (parse_uri(altptr, strlen(altptr), &suri) != 0) { continue; @@ -163,22 +164,30 @@ int check_x509_subj(X509 *pcert, str* sdom) int verify_x509(X509 *pcert, X509_STORE *pcacerts) { - X509_STORE_CTX ca_ctx; + X509_STORE_CTX *ca_ctx = NULL; char *strerr; + ca_ctx = X509_STORE_CTX_new(); + if(ca_ctx==NULL) { + LM_ERR("cannot get a x509 context\n"); + return -1; + } - if (X509_STORE_CTX_init(&ca_ctx, pcacerts, pcert, NULL) != 1) { + if (X509_STORE_CTX_init(ca_ctx, pcacerts, pcert, NULL) != 1) { LOG(L_ERR, "AUTH_IDENTITY:verify_x509: Unable to init X509 store ctx\n"); + X509_STORE_CTX_free(ca_ctx); return -1; } - if (X509_verify_cert(&ca_ctx) != 1) { - strerr = (char *) X509_verify_cert_error_string(ca_ctx.error); + if (X509_verify_cert(ca_ctx) != 1) { + strerr = (char *)X509_verify_cert_error_string(X509_STORE_CTX_get_error(ca_ctx)); LOG(L_ERR, "AUTH_IDENTITY VERIFIER: Certificate verification error: %s\n", strerr); - X509_STORE_CTX_cleanup(&ca_ctx); + X509_STORE_CTX_cleanup(ca_ctx); + X509_STORE_CTX_free(ca_ctx); return -2; } - X509_STORE_CTX_cleanup(&ca_ctx); + X509_STORE_CTX_cleanup(ca_ctx); + X509_STORE_CTX_free(ca_ctx); LOG(AUTH_DBG_LEVEL, "AUTH_IDENTITY VERIFIER: Certificate is valid\n");

7 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016