denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid unneeded termination of netlink algorithm name arrays with END_OF_LIST

Browse Source
This commit is contained in:
Martin Willi
2013-03-15 14:01:15 +01:00
parent d3f5a05e29
commit 6ac601f543
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
+14 -13
View File
@@ -176,8 +176,6 @@ ENUM(xfrm_attr_type_names, XFRMA_UNSPEC, XFRMA_REPLAY_ESN_VAL,
"XFRMA_REPLAY_ESN_VAL", "XFRMA_REPLAY_ESN_VAL",
); );
#define END_OF_LIST -1
/** /**
* Algorithms for encryption * Algorithms for encryption
*/ */
@@ -208,7 +206,6 @@ static kernel_algorithm_t encryption_algs[] = {
/* {ENCR_CAMELLIA_CCM_ICV16, "***" }, */ /* {ENCR_CAMELLIA_CCM_ICV16, "***" }, */
{ENCR_SERPENT_CBC, "serpent" }, {ENCR_SERPENT_CBC, "serpent" },
{ENCR_TWOFISH_CBC, "twofish" }, {ENCR_TWOFISH_CBC, "twofish" },
{END_OF_LIST, NULL }
}; };
/** /**
@@ -226,7 +223,6 @@ static kernel_algorithm_t integrity_algs[] = {
/* {AUTH_DES_MAC, "***" }, */ /* {AUTH_DES_MAC, "***" }, */
/* {AUTH_KPDK_MD5, "***" }, */ /* {AUTH_KPDK_MD5, "***" }, */
{AUTH_AES_XCBC_96, "xcbc(aes)" }, {AUTH_AES_XCBC_96, "xcbc(aes)" },
{END_OF_LIST, NULL }
}; };
/** /**
@@ -237,7 +233,6 @@ static kernel_algorithm_t compression_algs[] = {
{IPCOMP_DEFLATE, "deflate" }, {IPCOMP_DEFLATE, "deflate" },
{IPCOMP_LZS, "lzs" }, {IPCOMP_LZS, "lzs" },
{IPCOMP_LZJH, "lzjh" }, {IPCOMP_LZJH, "lzjh" },
{END_OF_LIST, NULL }
}; };
/** /**
@@ -246,33 +241,39 @@ static kernel_algorithm_t compression_algs[] = {
static char* lookup_algorithm(transform_type_t type, int ikev2) static char* lookup_algorithm(transform_type_t type, int ikev2)
{ {
kernel_algorithm_t *list; kernel_algorithm_t *list;
char *name = NULL; int i, count;
char *name;
switch (type) switch (type)
{ {
case ENCRYPTION_ALGORITHM: case ENCRYPTION_ALGORITHM:
list = encryption_algs; list = encryption_algs;
count = countof(encryption_algs);
break; break;
case INTEGRITY_ALGORITHM: case INTEGRITY_ALGORITHM:
list = integrity_algs; list = integrity_algs;
count = countof(integrity_algs);
break; break;
case COMPRESSION_ALGORITHM: case COMPRESSION_ALGORITHM:
list = compression_algs; list = compression_algs;
count = countof(compression_algs);
break; break;
default: default:
return NULL; return NULL;
} }
while (list->ikev2 != END_OF_LIST) for (i = 0; i < count; i++)
{ {
if (list->ikev2 == ikev2) if (list[i].ikev2 == ikev2)
{ {
return list->name; return list[i].name;
} }
list++;
} }
hydra->kernel_interface->lookup_algorithm(hydra->kernel_interface, ikev2, if (hydra->kernel_interface->lookup_algorithm(hydra->kernel_interface,
type, NULL, &name); ikev2, type, NULL, &name))
return name; {
return name;
}
return NULL;
} }
typedef struct private_kernel_netlink_ipsec_t private_kernel_netlink_ipsec_t; typedef struct private_kernel_netlink_ipsec_t private_kernel_netlink_ipsec_t;