sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-04 00:00:14 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'openwrt-fixes'

Browse Source 
Closes strongswan/strongswan#2185
This commit is contained in:
Tobias Brunner 2024-04-03 11:28:24 +02:00
commit 9c208c4e46
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcharon/plugins/uci/uci_parser.c
View File

@ -76,7 +76,7 @@ METHOD(enumerator_t, section_enumerator_enumerate, bool,
if (uci_lookup(this->ctx, &element, this->package,
this->current->name, "name") == UCI_OK)
{ /* use "name" attribute as config name if available ... */
*value = uci_to_option(element)->value;
*value = uci_to_option(element)->v.string;
}
else
{ /* ... or the section name becomes config name */
@ -91,7 +91,7 @@ METHOD(enumerator_t, section_enumerator_enumerate, bool,
if (value && uci_lookup(this->ctx, &element, this->package,
this->current->name, this->keywords[i]) == UCI_OK)
{
*value = uci_to_option(element)->value;
*value = uci_to_option(element)->v.string;
}
}

3
src/libstrongswan/plugins/wolfssl/wolfssl_common.h
View File

@ -80,7 +80,4 @@ typedef union {
#undef PARSE_ERROR
/* Eliminate macro conflicts */
#undef RNG
#endif /* WOLFSSL_PLUGIN_COMMON_H_ */

2
src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
View File

@ -47,6 +47,8 @@
#include <wolfssl/ssl.h>
#undef RNG
#ifndef FIPS_MODE
#define FIPS_MODE 0
#endif