Skip to content

Check output buffer size in wolfSSL_EVP_PKEY_encrypt. #11929

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

Open
danielinux wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Check output buffer size in wolfSSL_EVP_PKEY_encrypt. #11929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d0624f
Check output buffer size in wolfSSL_EVP_PKEY_encrypt.
danielinux Oct 29, 2026
3ea4071
Set outlen to buffer size before EVP_PKEY_encrypt in openssl_pkey0_test.
danielinux Oct 30, 2026
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
74 changes: 74 additions & 0 deletions tests/api/test_evp_pkey.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2804,6 +2804,80 @@ int test_wolfSSL_EVP_PKEY_decrypt_outLen(void)
return EXPECT_RESULT();
}

int test_wolfSSL_EVP_PKEY_encrypt_outLen(void)
{
EXPECT_DECLS;
#if defined(OPENSSL_EXTRA) && !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN)
WOLFSSL_RSA* rsa = NULL;
WOLFSSL_EVP_PKEY* pkey = NULL;
WOLFSSL_EVP_PKEY_CTX* ctx = NULL;
const size_t rsaKeySz = 2048/8;
const size_t bufSz = 32;
byte in[200];
byte* enc = NULL;
byte* dec = NULL;
size_t encLen = 2048/8;
size_t decLen = 0;
size_t i = 0;

XMEMSET(in, 0x5a, sizeof(in));

ExpectNotNull(enc = (byte*)XMALLOC(rsaKeySz, HEAP_HINT,
DYNAMIC_TYPE_TMP_BUFFER));
if (enc != NULL) {
XMEMSET(enc, 0xa5, rsaKeySz);
}
ExpectNotNull(dec = (byte*)XMALLOC(rsaKeySz, HEAP_HINT,
DYNAMIC_TYPE_TMP_BUFFER));
if (dec != NULL) {
XMEMSET(dec, 0, rsaKeySz);
}

ExpectNotNull(rsa = RSA_generate_key(2048, WC_RSA_EXPONENT, NULL, NULL));
ExpectNotNull(pkey = wolfSSL_EVP_PKEY_new());
ExpectIntEQ(EVP_PKEY_assign_RSA(pkey, rsa), WOLFSSL_SUCCESS);
if (EXPECT_FAIL()) {
RSA_free(rsa);
}
ExpectNotNull(ctx = EVP_PKEY_CTX_new(pkey, NULL));
if (pkey != NULL) {
EVP_PKEY_free(pkey);
}

ExpectIntEQ(EVP_PKEY_encrypt_init(ctx), WOLFSSL_SUCCESS);
ExpectIntEQ(EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING),
WOLFSSL_SUCCESS);

encLen = bufSz;
ExpectIntEQ(EVP_PKEY_encrypt(ctx, enc, &encLen, in, sizeof(in)),
WOLFSSL_FAILURE);
if (enc != NULL) {
for (i = 0; i < rsaKeySz; i++) {
if (enc[i] != 0xa5)
break;
}
}
ExpectIntEQ(i, rsaKeySz);

encLen = rsaKeySz;
ExpectIntEQ(EVP_PKEY_encrypt(ctx, enc, &encLen, in, sizeof(in)),
WOLFSSL_SUCCESS);
ExpectIntEQ(encLen, rsaKeySz);

ExpectIntEQ(EVP_PKEY_decrypt_init(ctx), WOLFSSL_SUCCESS);
decLen = rsaKeySz;
ExpectIntEQ(EVP_PKEY_decrypt(ctx, dec, &decLen, enc, encLen),
WOLFSSL_SUCCESS);
ExpectIntEQ(decLen, sizeof(in));
ExpectIntEQ(XMEMCMP(dec, in, sizeof(in)), 0);

EVP_PKEY_CTX_free(ctx);
XFREE(enc, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(dec, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return EXPECT_RESULT();
}

int test_wolfSSL_EVP_PKEY_derive(void)
{
EXPECT_DECLS;
Expand Down
2 changes: 2 additions & 0 deletions tests/api/test_evp_pkey.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ int test_wolfSSL_EVP_DigestSign(void);
int test_wolfSSL_EVP_DigestSign_ecc(void);
int test_wolfSSL_EVP_PKEY_encrypt(void);
int test_wolfSSL_EVP_PKEY_decrypt_outLen(void);
int test_wolfSSL_EVP_PKEY_encrypt_outLen(void);
int test_wolfSSL_EVP_PKEY_derive(void);
int test_wolfSSL_EVP_PKEY_print_public(void);
int test_wolfSSL_EVP_PKEY_ed25519(void);
Expand Down Expand Up @@ -130,6 +131,7 @@ int test_wolfSSL_CTX_use_PrivateKey_pkcs8_repopulate(void);
TEST_DECL_GROUP("evp_pkey", test_wolfSSL_EVP_DigestSign_ecc), \
TEST_DECL_GROUP("evp_pkey", test_wolfSSL_EVP_PKEY_encrypt), \
TEST_DECL_GROUP("evp_pkey", test_wolfSSL_EVP_PKEY_decrypt_outLen), \
TEST_DECL_GROUP("evp_pkey", test_wolfSSL_EVP_PKEY_encrypt_outLen), \
TEST_DECL_GROUP("evp_pkey", test_wolfSSL_EVP_PKEY_derive), \
TEST_DECL_GROUP("evp_pkey", test_wolfSSL_EVP_PKEY_print_public), \
TEST_DECL_GROUP("evp_pkey", test_wolfSSL_EVP_PKEY_ed25519), \
Expand Down
41 changes: 25 additions & 16 deletions wolfcrypt/src/evp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3342,33 +3342,42 @@ int wolfSSL_EVP_PKEY_encrypt(WOLFSSL_EVP_PKEY_CTX *ctx,
switch (ctx->pkey->type) {
#if !defined(NO_RSA)
case WC_EVP_PKEY_RSA:
if (out == NULL) {
if (ctx->pkey->rsa == NULL) {
WOLFSSL_MSG("Internal wolfCrypt RSA object is NULL.");
return WOLFSSL_FAILURE;
}
len = wolfSSL_RSA_size(ctx->pkey->rsa);
if (len <= 0) {
WOLFSSL_MSG("Error getting RSA size.");
return WOLFSSL_FAILURE;
}
if (outLen == NULL) {
WOLFSSL_MSG("outLen is NULL.");
return WOLFSSL_FAILURE;
}
{
int rsaSz;

*outLen = (size_t)len;
if (ctx->pkey->rsa == NULL) {
WOLFSSL_MSG("Internal wolfCrypt RSA object is NULL.");
return WOLFSSL_FAILURE;
}
if (outLen == NULL) {
WOLFSSL_MSG("outLen is NULL.");
return WOLFSSL_FAILURE;
}
rsaSz = wolfSSL_RSA_size(ctx->pkey->rsa);
if (rsaSz <= 0) {
WOLFSSL_MSG("Error getting RSA size.");
return WOLFSSL_FAILURE;
}

if (out == NULL) {
*outLen = (size_t)rsaSz;
return WOLFSSL_SUCCESS;
}

if (*outLen < (size_t)rsaSz) {
Comment thread
danielinux marked this conversation as resolved.
Resolved
WOLFSSL_MSG("Output buffer too small.");
return WOLFSSL_FAILURE;
}

len = wolfSSL_RSA_public_encrypt((int)inLen, (unsigned char *)in, out,
ctx->pkey->rsa, ctx->padding);
ctx->pkey->rsa, ctx->padding);
if (len < 0)
break;
else {
*outLen = (size_t)len;
return WOLFSSL_SUCCESS;
}
}
#endif /* NO_RSA */

case WC_EVP_PKEY_EC:
Expand Down
2 changes: 2 additions & 0 deletions wolfcrypt/test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48328,6 +48328,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t openssl_pkey0_test(void)
goto openssl_pkey0_test_done;
}
XMEMSET(out, 0, sizeof(out));
outlen = sizeof(out);
ret = wolfSSL_EVP_PKEY_encrypt(enc, out, &outlen, in, sizeof(in));
if (ret != 1) {
printf("error encrypting msg\n");
Expand Down Expand Up @@ -48381,6 +48382,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t openssl_pkey0_test(void)
#endif

XMEMSET(out, 0, sizeof(out));
outlen = sizeof(out);
ret = wolfSSL_EVP_PKEY_encrypt(enc, out, &outlen, in, sizeof(in));
if (ret != 1) {
printf("error encrypting msg\n");
Expand Down
Loading