wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-08 07:40:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Leverage wc constructors for ED*

Browse Source
This commit is contained in:
Lealem Amedie
2026-04-16 18:39:32 -06:00
parent 86c56de33f
commit e0be9777f6
3 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pk.c
+28 -6
View File
@@ -5516,6 +5516,9 @@ ed25519_key* wolfSSL_ED25519_new(void* heap, int devId)
WOLFSSL_ENTER("wolfSSL_ED25519_new");
#ifndef WC_NO_CONSTRUCTORS
key = wc_ed25519_new(heap, devId, NULL);
#else
key = (ed25519_key*)XMALLOC(sizeof(ed25519_key), heap,
DYNAMIC_TYPE_ED25519);
if (key == NULL) {
@@ -5526,6 +5529,7 @@ ed25519_key* wolfSSL_ED25519_new(void* heap, int devId)
XFREE(key, heap, DYNAMIC_TYPE_ED25519);
key = NULL;
}
#endif
return key;
}
@@ -5537,10 +5541,16 @@ ed25519_key* wolfSSL_ED25519_new(void* heap, int devId)
void wolfSSL_ED25519_free(ed25519_key* key)
{
if (key != NULL) {
void* heap = key->heap;
WOLFSSL_ENTER("wolfSSL_ED25519_free");
wc_ed25519_free(key);
XFREE(key, heap, DYNAMIC_TYPE_ED25519);
#ifndef WC_NO_CONSTRUCTORS
wc_ed25519_delete(key, NULL);
#else
{
void* heap = key->heap;
wc_ed25519_free(key);
XFREE(key, heap, DYNAMIC_TYPE_ED25519);
}
#endif
}
}
#endif /* (OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL) && HAVE_ED25519 */
@@ -6013,6 +6023,10 @@ ed448_key* wolfSSL_ED448_new(void* heap, int devId)
WOLFSSL_ENTER("wolfSSL_ED448_new");
#if !defined(WC_NO_CONSTRUCTORS) && \
(!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
key = wc_ed448_new(heap, devId, NULL);
#else
key = (ed448_key*)XMALLOC(sizeof(ed448_key), heap, DYNAMIC_TYPE_ED448);
if (key == NULL) {
WOLFSSL_ERROR_MSG("wolfSSL_ED448_new malloc failure");
@@ -6022,6 +6036,7 @@ ed448_key* wolfSSL_ED448_new(void* heap, int devId)
XFREE(key, heap, DYNAMIC_TYPE_ED448);
key = NULL;
}
#endif
return key;
}
@@ -6033,10 +6048,17 @@ ed448_key* wolfSSL_ED448_new(void* heap, int devId)
void wolfSSL_ED448_free(ed448_key* key)
{
if (key != NULL) {
void* heap = key->heap;
WOLFSSL_ENTER("wolfSSL_ED448_free");
wc_ed448_free(key);
XFREE(key, heap, DYNAMIC_TYPE_ED448);
#if !defined(WC_NO_CONSTRUCTORS) && \
(!defined(HAVE_FIPS) || FIPS_VERSION_GE(7, 0))
wc_ed448_delete(key, NULL);
#else
{
void* heap = key->heap;
wc_ed448_free(key);
XFREE(key, heap, DYNAMIC_TYPE_ED448);
}
#endif
}
}
#endif /* (OPENSSL_EXTRA || WOLFSSL_WPAS_SMALL) && HAVE_ED448 */
wolfcrypt/src/ed448.c
+35
View File
@@ -959,6 +959,41 @@ void wc_ed448_free(ed448_key* key)
}
}
#ifndef WC_NO_CONSTRUCTORS
ed448_key* wc_ed448_new(void* heap, int devId, int *result_code)
{
int ret;
ed448_key* key = (ed448_key*)XMALLOC(sizeof(ed448_key), heap,
DYNAMIC_TYPE_ED448);
if (key == NULL) {
ret = MEMORY_E;
}
else {
ret = wc_ed448_init_ex(key, heap, devId);
if (ret != 0) {
XFREE(key, heap, DYNAMIC_TYPE_ED448);
key = NULL;
}
}
if (result_code != NULL)
*result_code = ret;
return key;
}
int wc_ed448_delete(ed448_key* key, ed448_key** key_p) {
void* heap;
if (key == NULL)
return BAD_FUNC_ARG;
heap = key->heap;
wc_ed448_free(key);
XFREE(key, heap, DYNAMIC_TYPE_ED448);
if (key_p != NULL)
*key_p = NULL;
return 0;
}
#endif /* !WC_NO_CONSTRUCTORS */
#ifdef HAVE_ED448_KEY_EXPORT
wolfssl/wolfcrypt/ed448.h
+6
View File
@@ -163,6 +163,12 @@ WOLFSSL_API
int wc_ed448_init(ed448_key* key);
WOLFSSL_API
void wc_ed448_free(ed448_key* key);
#ifndef WC_NO_CONSTRUCTORS
WOLFSSL_API
ed448_key* wc_ed448_new(void* heap, int devId, int *result_code);
WOLFSSL_API
int wc_ed448_delete(ed448_key* key, ed448_key** key_p);
#endif
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL)
WOLFSSL_API