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.
This commit is contained in:
@@ -322,7 +322,6 @@ METHOD(plugin_t, get_features, int,
|
|||||||
PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_NULL),
|
PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_NULL),
|
||||||
PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_WITH_NULL),
|
PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_WITH_NULL),
|
||||||
#endif
|
#endif
|
||||||
#ifdef BOTAN_HAS_EMSA1
|
|
||||||
#ifdef BOTAN_HAS_SHA1
|
#ifdef BOTAN_HAS_SHA1
|
||||||
PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_SHA1_DER),
|
PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_SHA1_DER),
|
||||||
PLUGIN_PROVIDE(PUBKEY_VERIFY, 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(PRIVKEY_SIGN, SIGN_ECDSA_256),
|
||||||
PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_256),
|
PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_256),
|
||||||
#endif
|
#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_SHA384_DER),
|
||||||
PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_SHA512_DER),
|
PLUGIN_PROVIDE(PRIVKEY_SIGN, SIGN_ECDSA_WITH_SHA512_DER),
|
||||||
PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_WITH_SHA384_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_384),
|
||||||
PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_521),
|
PLUGIN_PROVIDE(PUBKEY_VERIFY, SIGN_ECDSA_521),
|
||||||
#endif
|
#endif
|
||||||
#endif /* BOTAN_HAS_EMSA1 */
|
|
||||||
#endif /* BOTAN_HAS_ECDSA */
|
#endif /* BOTAN_HAS_ECDSA */
|
||||||
|
|
||||||
#ifdef BOTAN_HAS_ED25519
|
#ifdef BOTAN_HAS_ED25519
|
||||||
|
|||||||
Reference in New Issue
Block a user