feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

linuxkm ecdsa: fix ecc define guards.

Browse Source
This commit is contained in:
jordan
2025-04-07 12:04:18 -04:00
parent a626ec242e
commit 69688c223b
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
linuxkm/lkcapi_ecdsa_glue.c
View File

@ -37,9 +37,9 @@ static int linuxkm_test_ecdsa_nist_driver(const char * driver,
const byte * sig, word32 sig_len,
const byte * hash, word32 hash_len);
#if defined(HAVE_ECC192)
#if defined(LINUXKM_ECC192)
static int ecdsa_nist_p192_loaded = 0;
#endif /* HAVE_ECC192 */
#endif /* LINUXKM_ECC192 */
static int ecdsa_nist_p256_loaded = 0;
static int ecdsa_nist_p384_loaded = 0;
#if defined(HAVE_ECC521)
@ -60,16 +60,16 @@ static unsigned int km_ecdsa_max_size(struct crypto_akcipher *tfm);
static int km_ecdsa_verify(struct akcipher_request *req);
/* ecdsa_nist_pN callbacks */
#if defined(HAVE_ECC192)
#if defined(LINUXKM_ECC192)
static int km_ecdsa_nist_p192_init(struct crypto_akcipher *tfm);
#endif /* HAVE_ECC192 */
#endif /* LINUXKM_ECC192 */
static int km_ecdsa_nist_p256_init(struct crypto_akcipher *tfm);
static int km_ecdsa_nist_p384_init(struct crypto_akcipher *tfm);
#if defined(HAVE_ECC521)
static int km_ecdsa_nist_p521_init(struct crypto_akcipher *tfm);
#endif /* HAVE_ECC521 */
#if defined(HAVE_ECC192)
#if defined(LINUXKM_ECC192)
static struct akcipher_alg ecdsa_nist_p192 = {
.base.cra_name = "ecdsa-nist-p192",
.base.cra_driver_name = "ecdsa-nist-p192-wolfcrypt",
@ -82,7 +82,7 @@ static struct akcipher_alg ecdsa_nist_p192 = {
.init = km_ecdsa_nist_p192_init,
.exit = km_ecdsa_exit,
};
#endif /* HAVE_ECC192 */
#endif /* LINUXKM_ECC192 */
static struct akcipher_alg ecdsa_nist_p256 = {
.base.cra_name = "ecdsa-nist-p256",
@ -145,7 +145,7 @@ static int km_ecdsa_set_pub(struct crypto_akcipher *tfm, const void *key,
ctx = akcipher_tfm_ctx(tfm);
switch (ctx->curve_len) {
#if defined(HAVE_ECC192)
#if defined(LINUXKM_ECC192)
case 24: /* p192 */
#endif
case 32: /* p256 */
@ -276,12 +276,12 @@ static int km_ecdsa_init(struct crypto_akcipher *tfm, int curve_id)
return 0;
}
#if defined(HAVE_ECC192)
#if defined(LINUXKM_ECC192)
static int km_ecdsa_nist_p192_init(struct crypto_akcipher *tfm)
{
return km_ecdsa_init(tfm, ECC_SECP192R1);
}
#endif /* HAVE_ECC192 */
#endif /* LINUXKM_ECC192 */
static int km_ecdsa_nist_p256_init(struct crypto_akcipher *tfm)
{
@ -393,7 +393,7 @@ ecdsa_verify_end:
return err;
}
#if defined(HAVE_ECC192)
#if defined(LINUXKM_ECC192)
static int linuxkm_test_ecdsa_nist_p192(void)
{
int rc = 0;
@ -443,7 +443,7 @@ static int linuxkm_test_ecdsa_nist_p192(void)
return rc;
}
#endif /* HAVE_ECC192 */
#endif /* LINUXKM_ECC192 */
static int linuxkm_test_ecdsa_nist_p256(void)
{

23
linuxkm/lkcapi_glue.c
View File

@ -4195,7 +4195,22 @@ static int linuxkm_test_aesecb(void) {
#undef LINUXKM_LKCAPI_REGISTER_ECDSA
#endif /* HAVE_ECC */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0) && \
defined(LINUXKM_LKCAPI_REGISTER_ECDSA)
/**
* note: ecdsa only supported with linux 6.12 and earlier for now.
* In linux 6.13, ecdsa changed from a struct akcipher_alg type to
* struct sig_alg type, and the sign/verify callbacks were removed
* from akcipher_alg.
* */
#undef LINUXKM_LKCAPI_REGISTER_ECDSA
#endif
#if defined(LINUXKM_LKCAPI_REGISTER_ECDSA)
#if (defined(HAVE_ECC192) || defined(HAVE_ALL_CURVES)) && \
ECC_MIN_KEY_SZ <= 192
#define LINUXKM_ECC192
#endif
#include "linuxkm/lkcapi_ecdsa_glue.c"
#endif
@ -4284,10 +4299,10 @@ static int linuxkm_lkcapi_register(void)
#endif
#ifdef LINUXKM_LKCAPI_REGISTER_ECDSA
#if defined(HAVE_ECC192)
#if defined(LINUXKM_ECC192)
REGISTER_ALG(ecdsa_nist_p192, crypto_register_akcipher,
linuxkm_test_ecdsa_nist_p192);
#endif /* HAVE_ECC192 */
#endif /* LINUXKM_ECC192 */
REGISTER_ALG(ecdsa_nist_p256, crypto_register_akcipher,
linuxkm_test_ecdsa_nist_p256);
@ -4352,9 +4367,9 @@ static void linuxkm_lkcapi_unregister(void)
#endif
#ifdef LINUXKM_LKCAPI_REGISTER_ECDSA
#if defined(HAVE_ECC192)
#if defined(LINUXKM_ECC192)
UNREGISTER_ALG(ecdsa_nist_p192, crypto_unregister_akcipher);
#endif /* HAVE_ECC192 */
#endif /* LINUXKM_ECC192 */
UNREGISTER_ALG(ecdsa_nist_p256, crypto_unregister_akcipher);
UNREGISTER_ALG(ecdsa_nist_p384, crypto_unregister_akcipher);
#if defined(HAVE_ECC521)