Skip to content

20260806-WC_HAVE_RNG_BANKREF #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philljj merged 1 commit into from
Aug 6, 2026
+21 −16
Merged

20260806-WC_HAVE_RNG_BANKREF #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions kernel-src/wolfcrypt_glue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#error WG_USE_PUBLIC_KEY_COMPRESSION requires HAVE_COMP_KEY
#endif

#ifdef WC_DRBG_BANKREF
#ifdef WC_HAVE_RNG_BANKREF

#include <crypto/rng.h>

Expand Down Expand Up @@ -579,7 +579,7 @@ int wc_ecc_make_keypair_exim(u8 *private, const size_t private_len,
u8 *public, const size_t public_len,
const int curve_id, int compressed)
{
#ifndef WC_DRBG_BANKREF
#ifndef WC_HAVE_RNG_BANKREF
struct wc_rng_inst *rng_inst = NULL;
#endif
WC_RNG *rng = NULL;
Expand All @@ -604,7 +604,7 @@ int wc_ecc_make_keypair_exim(u8 *private, const size_t private_len,
goto out;
key_inited = 1;

#ifdef WC_DRBG_BANKREF
#ifdef WC_HAVE_RNG_BANKREF
ret = wc_rng_new_bankref(wc_wg_drbg, &rng);
if (ret)
goto out;
Expand Down Expand Up @@ -664,7 +664,7 @@ int wc_ecc_make_keypair_exim(u8 *private, const size_t private_len,

out:

#ifdef WC_DRBG_BANKREF
#ifdef WC_HAVE_RNG_BANKREF
wc_rng_free(rng);
#else
if (rng_inst)
Expand Down Expand Up @@ -709,12 +709,12 @@ int wc_ecc_private_to_public_exim(const u8 *private, const size_t private_len,
goto out;

{
#ifndef WC_DRBG_BANKREF
#ifndef WC_HAVE_RNG_BANKREF
struct wc_rng_inst *rng_inst;
#endif
WC_RNG *rng;

#ifdef WC_DRBG_BANKREF
#ifdef WC_HAVE_RNG_BANKREF
ret = wc_rng_new_bankref(wc_wg_drbg, &rng);
if (ret)
goto out;
Expand All @@ -729,7 +729,7 @@ int wc_ecc_private_to_public_exim(const u8 *private, const size_t private_len,

ret = wc_ecc_make_pub_ex(key, NULL /* pubOut */, rng);

#ifdef WC_DRBG_BANKREF
#ifdef WC_HAVE_RNG_BANKREF
wc_rng_free(rng);
#else
put_drbg(rng_inst);
Expand Down Expand Up @@ -781,7 +781,7 @@ int wc_ecc_shared_secret_exim(u8 *secret, size_t secret_len,
int privKey_inited = 0, pubKey_inited = 0;
int ret;
#ifdef ECC_TIMING_RESISTANT
#ifndef WC_DRBG_BANKREF
#ifndef WC_HAVE_RNG_BANKREF
struct wc_rng_inst *rng_inst = NULL;
#endif
WC_RNG *rng = NULL;
Expand Down Expand Up @@ -817,7 +817,7 @@ int wc_ecc_shared_secret_exim(u8 *secret, size_t secret_len,
pubKey_inited = 1;

#ifdef ECC_TIMING_RESISTANT
#ifdef WC_DRBG_BANKREF
#ifdef WC_HAVE_RNG_BANKREF
ret = wc_rng_new_bankref(wc_wg_drbg, &rng);
if (ret) {
ret = -EFAULT;
Expand Down Expand Up @@ -860,7 +860,7 @@ int wc_ecc_shared_secret_exim(u8 *secret, size_t secret_len,
out:

#ifdef ECC_TIMING_RESISTANT
#ifdef WC_DRBG_BANKREF
#ifdef WC_HAVE_RNG_BANKREF
wc_rng_free(rng);
#else
if (rng_inst)
Expand All @@ -881,7 +881,7 @@ int wc_ecc_shared_secret_exim(u8 *secret, size_t secret_len,
WC_DEBUG_PR_NEG_RET(ret);
}

#ifdef WC_DRBG_BANKREF
#ifdef WC_HAVE_RNG_BANKREF

struct wc_rng_bank *wc_wg_drbg;
static int wc_wg_drbg_is_global_default;
Expand Down Expand Up @@ -1121,7 +1121,7 @@ int wc_linuxkm_drbg_generate(struct wc_rng_bank **ctx,
}


#else /* !WC_DRBG_BANKREF */
#else /* !WC_HAVE_RNG_BANKREF */
/* snarfed from wolfssl/linuxkm/lkcapi_sha_glue.c */
struct wc_linuxkm_drbg_ctx wc_wg_drbg;

Expand Down Expand Up @@ -1351,4 +1351,4 @@ int wc_linuxkm_drbg_generate(struct wc_linuxkm_drbg_ctx *ctx,
return 0;
}

#endif /* !WC_DRBG_BANKREF */
#endif /* !WC_HAVE_RNG_BANKREF */
11 changes: 8 additions & 3 deletions kernel-src/wolfcrypt_glue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,12 @@ extern bool wc_AesGcm_decrypt_sg_inplace(struct scatterlist *src, size_t src_len
const u8 *key,
const size_t key_len);

#ifdef WC_DRBG_BANKREF
/* backward compat */
#if defined(WC_DRBG_BANKREF) && !defined(WC_HAVE_RNG_BANKREF)
#define WC_HAVE_RNG_BANKREF
#endif

#ifdef WC_HAVE_RNG_BANKREF

extern struct wc_rng_bank *wc_wg_drbg;
int wc_linuxkm_drbg_init_ctx(struct wc_rng_bank **ctx);
Expand All @@ -216,7 +221,7 @@ int wc_linuxkm_drbg_generate(struct wc_rng_bank **ctx,
u8 *dst, unsigned int dlen,
int nofail_p);

#else /* !WC_DRBG_BANKREF */
#else /* !WC_HAVE_RNG_BANKREF */

/* snarfed from wolfssl/linuxkm/lkcapi_sha_glue.c */
struct wc_linuxkm_drbg_ctx {
Expand All @@ -237,7 +242,7 @@ int wc_linuxkm_drbg_generate(struct wc_linuxkm_drbg_ctx *ctx,
int wc_linuxkm_drbg_init_ctx(struct wc_linuxkm_drbg_ctx *ctx);
void wc_linuxkm_drbg_ctx_clear(struct wc_linuxkm_drbg_ctx * ctx);

#endif /* !WC_DRBG_BANKREF */
#endif /* !WC_HAVE_RNG_BANKREF */

int wc_ecc_make_keypair_exim(u8 *private, const size_t private_len,
u8 *public, const size_t public_len,
Expand Down