-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
strongswan: Backport upstream fix for RNG definition conflict
Signed-off-by: Philip Prindeville <[email protected]>
- Loading branch information
1 parent
fa3ed77
commit b5e8f4c
Showing
3 changed files
with
40 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
commit 5226561a77efc94b53d708a855df267b11f53b83 | ||
Author: Philip Prindeville <[email protected]> | ||
Date: Wed Mar 27 17:41:18 2024 -0600 | ||
|
||
wolfssl: avoid RNG redefinition | ||
|
||
There are definitions of RNG in <wolfcrypt/settings.h> and | ||
<wolfcrypt/random.h> that play havoc with the literal RNG being | ||
used in the expansions of _PLUGIN_FEATURE_RNG() => __PLUGIN_FEATURE() | ||
in <plugins/plugin_feature.h> when ##-concatenated to build the | ||
enum FEATURE_RNG. | ||
|
||
<plugins/plugin_feature.h> must always be included before | ||
<woldssl/ssl.h>, and RNG must be undefined before any plugins are | ||
declared. | ||
|
||
Signed-off-by: Philip Prindeville <[email protected]> | ||
|
||
--- 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 <wolfssl/ssl.h> | ||
|
||
+#undef RNG | ||
+ | ||
#ifndef FIPS_MODE | ||
#define FIPS_MODE 0 | ||
#endif |
This file was deleted.
Oops, something went wrong.