sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
252 discussions

git:master:baa17755: crupto: replace local fixup functions with core helpers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: baa177556514cd7cdb794740a1bfd6e47ea814d1 URL: https://github.com/kamailio/kamailio/commit/baa177556514cd7cdb794740a1bfd6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T07:56:26+02:00 crupto: replace local fixup functions with core helpers --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/baa177556514cd7cdb794740a1bfd6e… Patch: https://github.com/kamailio/kamailio/commit/baa177556514cd7cdb794740a1bfd6e… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index b3fba9c005a..f3e644000f9 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -58,10 +58,8 @@ static void mod_destroy(void); static int w_crypto_aes_encrypt( sip_msg_t *msg, char *inb, char *keyb, char *outb); -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); static int w_crypto_nio_in(sip_msg_t *msg, char *p1, char *p2); static int w_crypto_nio_out(sip_msg_t *msg, char *p1, char *p2); @@ -86,9 +84,9 @@ str _crypto_netio_key = STR_NULL; static cmd_export_t cmds[] = { {"crypto_aes_encrypt", (cmd_function)w_crypto_aes_encrypt, 3, - fixup_crypto_aes_encrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {"crypto_aes_decrypt", (cmd_function)w_crypto_aes_decrypt, 3, - fixup_crypto_aes_decrypt, 0, ANY_ROUTE}, + fixup_spve2_pvar, fixup_free_spve2_pvar, ANY_ROUTE}, {"crypto_netio_in", (cmd_function)w_crypto_nio_in, 0, 0, 0, ANY_ROUTE}, {"crypto_netio_out", (cmd_function)w_crypto_nio_out, 0, 0, 0, ANY_ROUTE}, @@ -345,28 +343,6 @@ static int w_crypto_aes_encrypt( return ki_crypto_aes_encrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_crypto_aes_encrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - /** * */ @@ -590,29 +566,6 @@ static int w_crypto_aes_decrypt( return ki_crypto_aes_decrypt_helper(msg, &ins, &keys, dst); } -/** - * - */ -static int fixup_crypto_aes_decrypt(void **param, int param_no) -{ - if(param_no == 1 || param_no == 2) { - if(fixup_spve_null(param, 1) < 0) - return -1; - return 0; - } else if(param_no == 3) { - if(fixup_pvar_null(param, 1) != 0) { - LM_ERR("failed to fixup result pvar\n"); - return -1; - } - if(((pv_spec_t *)(*param))->setf == NULL) { - LM_ERR("result pvar is not writeble\n"); - return -1; - } - } - return 0; -} - - /** * testing function */

7 months, 3 weeks

git:5.8:c48fbea9: gcrypt: docs - module name used for section ids

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.8 Commit: c48fbea981c7b0bd281cd1fc2abedcda41d92c13 URL: https://github.com/kamailio/kamailio/commit/c48fbea981c7b0bd281cd1fc2abedcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-01T08:05:20+02:00 gcrypt: docs - module name used for section ids (cherry picked from commit 68c69966c38b56775a3966d07c33ff94c2a8ba95) --- Modified: src/modules/gcrypt/doc/gcrypt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c48fbea981c7b0bd281cd1fc2abedcd… Patch: https://github.com/kamailio/kamailio/commit/c48fbea981c7b0bd281cd1fc2abedcd… --- diff --git a/src/modules/gcrypt/doc/gcrypt_admin.xml b/src/modules/gcrypt/doc/gcrypt_admin.xml index 533ec5c80f9..3fc03d3eabc 100644 --- a/src/modules/gcrypt/doc/gcrypt_admin.xml +++ b/src/modules/gcrypt/doc/gcrypt_admin.xml @@ -127,7 +127,7 @@ modparam("gcrypt", "register_callid", 1) <section> <title>Functions</title> - <section id="async.f.gcrypt_aes_encrypt"> + <section id="gcrypt.f.gcrypt_aes_encrypt"> <title> <function moreinfo="none">gcrypt_aes_encrypt(text, key, res)</function> </title> @@ -150,7 +150,7 @@ gcrypt_aes_encrypt("$rb", "my-secret-key", "$var(encrypted)"); </example> </section> - <section id="async.f.gcrypt_aes_decrypt"> + <section id="gcrypt.f.gcrypt_aes_decrypt"> <title> <function moreinfo="none">gcrypt_aes_decrypt(text, key, res)</function> </title>

7 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024