]> git.ipfire.org Git - thirdparty/strongswan.git/commit
wolfssl: Avoid conflict with RNG when built without EdDSA or FIPS enabled
authorPhilip Prindeville <philipp@redfish-solutions.com>
Wed, 27 Mar 2024 23:41:18 +0000 (17:41 -0600)
committerTobias Brunner <tobias@strongswan.org>
Wed, 3 Apr 2024 06:48:46 +0000 (08:48 +0200)
commite5bc3a50f6d326fd51dea5febee74e1ed7fb1e5e
tree97e01c5b0e770ab5d55cba81194d3af5748c550f
parent1b190539197f18ab5e3629caf4aa7397d47dfaad
wolfssl: Avoid conflict with RNG when built without EdDSA or FIPS enabled

There are definitions of RNG in <wolfssl/wolfcrypt/settings.h> and
<wolfssl/wolfcrypt/random.h> that play havoc with the literal RNG being
used in the expansions of PLUGIN_*(RNG, ...) when ##-concatenated to
build the enum value FEATURE_RNG.

The #undef in wolfssl_cmmon.h only had an effect if wolfSSL was built
with EdDSA or FIPS enabled, otherwise, the headers that define RNG were
not pulled in before it.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
src/libstrongswan/plugins/wolfssl/wolfssl_common.h
src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c