romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 13:03:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl_ed25519: tidy-up backend fallback

Browse source 
Sync fallback logic with other crypto algos to:

- allow falling back to the next backend candidate when wolfSSL does not
  have ed25519 built in.

- de-duplicate fallback code.

Follow-up to a55731050e #22386 #21239

Closes #22450
This commit is contained in:
Viktor Szakats 2026-07-31 00:26:37 +02:00
parent cb21a37a68
commit ca48bd076d
No known key found for this signature in database
1 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/curl_ed25519.c
View file

@ -35,6 +35,11 @@
#include "curl_ed25519.h"
#ifdef USE_WOLFSSL
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/settings.h>
#endif
#ifdef USE_OPENSSL
#include <openssl/evp.h>
@ -80,11 +85,9 @@ CURLcode Curl_ed25519_sign(const unsigned char *key, size_t keylen,
return CURLE_OK;
}
#elif defined(USE_WOLFSSL)
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/settings.h>
#if (defined(HAVE_ED25519) || defined(WOLFSSL_CURVE25519_USE_ED25519)) && \
defined(HAVE_ED25519_KEY_IMPORT) && defined(HAVE_ED25519_SIGN)
#elif defined(USE_WOLFSSL) && \
(defined(HAVE_ED25519) || defined(WOLFSSL_CURVE25519_USE_ED25519)) && \
defined(HAVE_ED25519_KEY_IMPORT) && defined(HAVE_ED25519_SIGN)
#include <wolfssl/wolfcrypt/ed25519.h>
#include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/wolfcrypt/random.h>
@ -141,23 +144,6 @@ fail:
return CURLE_AUTH_ERROR;
}
#else /* USE_WOLFSSL but no Ed25519 sign/import in this wolfSSL build */
CURLcode Curl_ed25519_sign(const unsigned char *key, size_t keylen,
const unsigned char *msg, size_t msglen,
unsigned char *sig, size_t *siglen)
{
(void)key;
(void)keylen;
(void)msg;
(void)msglen;
(void)sig;
(void)siglen;
return CURLE_NOT_BUILT_IN;
}
#endif /* wolfSSL Ed25519 */
#else /* no Ed25519-capable backend */
CURLcode Curl_ed25519_sign(const unsigned char *key, size_t keylen,