Skip to content

fix: verify() resource leaks and dead cleanup code (OpenSSL 3.x) #81

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
atoomic merged 3 commits into from
Mar 16, 2026
+28 −31
Merged

fix: verify() resource leaks and dead cleanup code (OpenSSL 3.x) #81

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
345f876
fix: verify() resource leaks on error paths and dead cleanup (OpenSSL…
Koan-Bot Feb 19, 2026
2584807
rebase: apply review feedback on #81
Koan-Bot Mar 12, 2026
e69c9b0
rebase: apply review feedback on #81
Koan-Bot Mar 14, 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
59 changes: 28 additions & 31 deletions RSA.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,14 @@ verify(p_rsa, text_SV, sig_SV)
rsaData* p_rsa;
SV* text_SV;
SV* sig_SV;
PREINIT:
int verify_result;
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
int error = 0;
int verify_pad;
EVP_PKEY_CTX *ctx = NULL;
EVP_MD *md = NULL;
#endif
PPCODE:
{
unsigned char* sig;
Expand All @@ -1109,52 +1117,42 @@ PPCODE:

CHECK_OPEN_SSL(digest = get_message_digest(text_SV, p_rsa->hashMode));
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
{
int verify_result;
EVP_PKEY_CTX *ctx;
ctx = EVP_PKEY_CTX_new(p_rsa->rsa, NULL /* no engine */);
CHECK_OPEN_SSL(ctx);
CHECK_OPEN_SSL(EVP_PKEY_verify_init(ctx) == 1);
/* FIXME: Issue setting padding in some cases */
int verify_pad = p_rsa->padding;
THROW(ctx);
THROW(EVP_PKEY_verify_init(ctx) == 1);
verify_pad = p_rsa->padding;
if (p_rsa->padding != RSA_NO_PADDING) {
verify_pad = RSA_PKCS1_PSS_PADDING;
}
CHECK_OPEN_SSL(EVP_PKEY_CTX_set_rsa_padding(ctx, verify_pad) > 0);
EVP_MD* md = get_md_bynid(p_rsa->hashMode);
CHECK_OPEN_SSL(md != NULL);
THROW(EVP_PKEY_CTX_set_rsa_padding(ctx, verify_pad) > 0);
md = get_md_bynid(p_rsa->hashMode);
THROW(md != NULL);

int md_status;
CHECK_OPEN_SSL((md_status = EVP_PKEY_CTX_set_signature_md(ctx, md)) > 0);
THROW(EVP_PKEY_CTX_set_signature_md(ctx, md) > 0);
if (p_rsa->padding == RSA_PKCS1_PSS_PADDING) {
CHECK_OPEN_SSL((md_status = EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, md)) > 0);
CHECK_OPEN_SSL(EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, RSA_PSS_SALTLEN_DIGEST) > 0);
THROW(EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, md) > 0);
THROW(EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, RSA_PSS_SALTLEN_DIGEST) > 0);
}

verify_result = EVP_PKEY_verify(ctx, sig, sig_length, digest, get_digest_length(p_rsa->hashMode));
EVP_MD_free(md);
EVP_PKEY_CTX_free(ctx);
switch(verify_result)
{
case 0:
ERR_clear_error();
XSRETURN_NO;
break;
case 1:
XSRETURN_YES;
break;
default:
CHECK_OPEN_SSL(0);
break;
}
}

goto verify_switch;
err:
if (md) EVP_MD_free(md);
if (ctx) EVP_PKEY_CTX_free(ctx);
CHECK_OPEN_SSL(0);
verify_switch: ;
#else
switch(RSA_verify(p_rsa->hashMode,
verify_result = RSA_verify(p_rsa->hashMode,
digest,
get_digest_length(p_rsa->hashMode),
sig,
sig_length,
p_rsa->rsa))
p_rsa->rsa);
#endif
switch(verify_result)
{
case 0:
ERR_clear_error();
Expand All @@ -1167,7 +1165,6 @@ PPCODE:
CHECK_OPEN_SSL(0);
break;
}
#endif
}

int
Expand Down
Loading