<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">commit 5226561a77efc94b53d708a855df267b11f53b83
Author: Philip Prindeville &lt;philipp@redfish-solutions.com&gt;
Date:   Wed Mar 27 17:41:18 2024 -0600

    wolfssl: avoid RNG redefinition
    
    There are definitions of RNG in &lt;wolfcrypt/settings.h&gt; and
    &lt;wolfcrypt/random.h&gt; that play havoc with the literal RNG being
    used in the expansions of _PLUGIN_FEATURE_RNG() =&gt; __PLUGIN_FEATURE()
    in &lt;plugins/plugin_feature.h&gt; when ##-concatenated to build the
    enum FEATURE_RNG.
    
    &lt;plugins/plugin_feature.h&gt; must always be included before
    &lt;woldssl/ssl.h&gt;, and RNG must be undefined before any plugins are
    declared.
    
    Signed-off-by: Philip Prindeville &lt;philipp@redfish-solutions.com&gt;

--- a/src/libstrongswan/plugins/wolfssl/wolfssl_common.h
+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_common.h
@@ -80,7 +80,4 @@ typedef union {
 
 #undef PARSE_ERROR
 
-/* Eliminate macro conflicts */
-#undef RNG
-
 #endif /* WOLFSSL_PLUGIN_COMMON_H_ */
--- a/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
@@ -47,6 +47,8 @@
 
 #include &lt;wolfssl/ssl.h&gt;
 
+#undef RNG
+
 #ifndef FIPS_MODE
 #define FIPS_MODE 0
 #endif
</pre></body></html>