Skip to content

Do not overide the user provided padding croak instead #168

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
timlegge merged 2 commits into from
Apr 23, 2026
+4 −8
Merged

Do not overide the user provided padding croak instead #168

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c5b50f
Do not overide the user provided padding croak instead
timlegge Apr 23, 2026
cb2baa6
Fix the referenced padding method in croak message
timlegge Apr 23, 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
12 changes: 4 additions & 8 deletions RSA.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,18 +454,15 @@ SV* rsa_crypt(rsaData* p_rsa, SV* p_from,
if(is_encrypt && p_rsa->padding == RSA_PKCS1_PSS_PADDING) {
croak("PKCS#1 v2.1 RSA-PSS cannot be used for encryption operations call \"use_pkcs1_oaep_padding\" instead.");
}

#if OPENSSL_VERSION_NUMBER >= 0x30000000L

EVP_PKEY_CTX *ctx = NULL;
int error = 0;
int crypt_pad;

if (is_encrypt) {
/* Encryption path: OAEP is the only safe padding for encrypt/decrypt. */
crypt_pad = p_rsa->padding;
if (p_rsa->padding != RSA_NO_PADDING) {
crypt_pad = RSA_PKCS1_OAEP_PADDING;
if (p_rsa->padding != RSA_NO_PADDING && p_rsa->padding != RSA_PKCS1_OAEP_PADDING) {
croak("Only OAEP padding or no padding is supported for encrypt/decrypt. "
"Call \"use_pkcs1_oaep_padding()\" or \"use_no_padding()\" first.");
}
} else {
/* Sign/verify_recover path (private_encrypt / public_decrypt):
Expand All @@ -479,15 +476,14 @@ SV* rsa_crypt(rsaData* p_rsa, SV* p_from,
croak("PSS padding with private_encrypt/public_decrypt is not supported. "
"Use sign()/verify() for PSS signatures.");
}
crypt_pad = p_rsa->padding;
}

ctx = EVP_PKEY_CTX_new_from_pkey(NULL, (EVP_PKEY* )p_rsa->rsa, NULL);

THROW(ctx);

THROW(init_crypt(ctx) == 1);
THROW(EVP_PKEY_CTX_set_rsa_padding(ctx, crypt_pad) > 0);
THROW(EVP_PKEY_CTX_set_rsa_padding(ctx, p_rsa->padding) > 0);
THROW(p_crypt(ctx, NULL, &to_length, from, from_length) == 1);
Newx(to, to_length, UNSIGNED_CHAR);
THROW(to);
Expand Down
Loading