From ab19f691c79c4012fac62a5e2379288f07874c7f Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 13 May 2026 16:03:31 +0200 Subject: [PATCH] botan: Fix registration of ECDSA signature/verification plugin features This was broken since the Botan 3 release, which removed the EMSA1 class and the define. The "EMSA1()" wrapper when signing/verifying is technically not necessary anymore since then (it's deprecated but still accepted). But to still support Botan 2, we keep that in for now. --- src/libstrongswan/plugins/botan/botan_plugin.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libstrongswan/plugins/botan/botan_plugin.c b/src/libstrongswan/plugins/botan/botan_plugin.c index b07ab67ca..876a0754e 100644 --- a/src/libstrongswan/plugins/botan/botan_plugin.c +++ b/src/libstrongswan/plugins/botan/botan_plugin.c @@ -322,7 +322,6 @@ METHOD(plugin_t, get_features, int, PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_NULL), PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_WITH_NULL), #endif -#ifdef BOTAN_HAS_EMSA1 #ifdef BOTAN_HAS_SHA1 PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_SHA1_DER), PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_WITH_SHA1_DER), @@ -333,7 +332,7 @@ METHOD(plugin_t, get_features, int, PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_256), PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_256), #endif -#ifndef BOTAN_HAS_SHA2_64 +#ifdef BOTAN_HAS_SHA2_64 PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_SHA384_DER), PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_SHA512_DER), PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_WITH_SHA384_DER), @@ -343,7 +342,6 @@ METHOD(plugin_t, get_features, int, PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_384), PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_521), #endif -#endif /* BOTAN_HAS_EMSA1 */ #endif /* BOTAN_HAS_ECDSA */ #ifdef BOTAN_HAS_ED25519