[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sr-dev
Subject:    [sr-dev] git:master:ccfb5a0f: auth: point auth_algorithm to a static list values
From:       Daniel-Constantin Mierla via sr-dev <sr-dev () lists ! kamailio ! org>
Date:       2024-05-15 20:21:15
Message-ID: E1s7L7j-0004Qw-T5 () www ! kamailio ! org
[Download RAW message or body]

Module: kamailio
Branch: master
Commit: ccfb5a0f852bf101c1e2ef46f08192921a4d963f
URL: https://github.com/kamailio/kamailio/commit/ccfb5a0f852bf101c1e2ef46f08192921a4d963f

Author: Daniel-Constantin Mierla <miconda@gmail.com>
Committer: Daniel-Constantin Mierla <miconda@gmail.com>
Date: 2024-05-15T22:03:43+02:00

auth: point auth_algorithm to a static list values

- function parameters can be overwritten by subsequent functions

---

Modified: src/modules/auth/auth_mod.c

---

Diff:  https://github.com/kamailio/kamailio/commit/ccfb5a0f852bf101c1e2ef46f08192921a4d963f.diff
Patch: https://github.com/kamailio/kamailio/commit/ccfb5a0f852bf101c1e2ef46f08192921a4d963f.patch

---

diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c
index 2fcb9169f26..6517dce566a 100644
--- a/src/modules/auth/auth_mod.c
+++ b/src/modules/auth/auth_mod.c
@@ -135,6 +135,17 @@ static struct qp auth_qauthint = {STR_STATIC_INIT("auth-int"), QOP_AUTHINT};
 
 /* Hash algorithm used for digest authentication, MD5 if empty */
 str auth_algorithm = {"", 0};
+
+#define AUTH_ALG_MD5_IDX 0
+#define AUTH_ALG_SHA256_IDX 1
+/* clang-format off */
+static str auth_algorithm_list[] = {
+	{"MD5", 3},
+	{"SHA-256", 7},
+	{NULL, 0}
+};
+/* clang-format on */
+
 int hash_hex_len;
 int add_authinfo_hdr =
 		0; /* should an Authentication-Info header be added on 200 OK responses? */
@@ -373,10 +384,12 @@ static int mod_init(void)
 	}
 
 	if(auth_algorithm.len == 0 || strcmp(auth_algorithm.s, "MD5") == 0) {
+		auth_algorithm = auth_algorithm_list[AUTH_ALG_MD5_IDX];
 		hash_hex_len = HASHHEXLEN;
 		calc_HA1 = calc_HA1_md5;
 		calc_response = calc_response_md5;
 	} else if(strcmp(auth_algorithm.s, "SHA-256") == 0) {
+		auth_algorithm = auth_algorithm_list[AUTH_ALG_SHA256_IDX];
 		hash_hex_len = HASHHEXLEN_SHA256;
 		calc_HA1 = calc_HA1_sha256;
 		calc_response = calc_response_sha256;
@@ -493,10 +506,12 @@ static int ki_auth_algorithm(sip_msg_t *msg, str *alg)
 	auth_algorithm = *alg;
 
 	if(strcmp(auth_algorithm.s, "MD5") == 0) {
+		auth_algorithm = auth_algorithm_list[AUTH_ALG_MD5_IDX];
 		hash_hex_len = HASHHEXLEN;
 		calc_HA1 = calc_HA1_md5;
 		calc_response = calc_response_md5;
 	} else if(strcmp(auth_algorithm.s, "SHA-256") == 0) {
+		auth_algorithm = auth_algorithm_list[AUTH_ALG_SHA256_IDX];
 		hash_hex_len = HASHHEXLEN_SHA256;
 		calc_HA1 = calc_HA1_sha256;
 		calc_response = calc_response_sha256;

_______________________________________________
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-leave@lists.kamailio.org
[prev in list] [next in list] [prev in thread] [next in thread]