From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 4 Jan 2021 14:58:59 +0000 (+0100)
Subject: wolfssl: Correctly enable Brainpool curves
X-Git-Tag: 5.9.2dr1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e2e359f3826f8b239528a79a093f782e2b0638a;p=thirdparty%2Fstrongswan.git

wolfssl: Correctly enable Brainpool curves
---

diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_ec_diffie_hellman.c b/src/libstrongswan/plugins/wolfssl/wolfssl_ec_diffie_hellman.c
index ceff4172c1..ba65006948 100644
--- a/src/libstrongswan/plugins/wolfssl/wolfssl_ec_diffie_hellman.c
+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_ec_diffie_hellman.c
@@ -333,7 +333,7 @@ wolfssl_ec_diffie_hellman_t *wolfssl_ec_diffie_hellman_create(diffie_hellman_gro
 			this->curve_id = ECC_SECP521R1;
 			this->keysize = (521 + 7) / 8;
 			break;
-#ifdef HAVE_BRAINPOOL
+#ifdef HAVE_ECC_BRAINPOOL
 		case ECP_224_BP:
 			this->curve_id = ECC_BRAINPOOLP224R1;
 			this->keysize = 224 / 8;
diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c b/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
index 4de89e54c6..8c0cbdcac8 100644
--- a/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
@@ -209,8 +209,8 @@ METHOD(plugin_t, get_features, int,
 	#if defined(HAVE_ECC192) || defined(HAVE_ALL_CURVES)
 			PLUGIN_PROVIDE(DH, ECP_192_BIT),
 	#endif
-	#ifdef HAVE_BRAINPOOL
-		#if !define(NO_ECC256) || defined(HAVE_ALL_CURVES)
+	#ifdef HAVE_ECC_BRAINPOOL
+		#if !defined(NO_ECC256) || defined(HAVE_ALL_CURVES)
 			PLUGIN_PROVIDE(DH, ECP_256_BP),
 		#endif
 		#if defined(HAVE_ECC384) || defined(HAVE_ALL_CURVES)