Skip to content

Commit 6889ee5

Browse files
[release/8.0-staging] in rsa signatures, configure digest before padding mode
Co-authored-by: Raphael Catolino <[email protected]>
1 parent 5cc544a commit 6889ee5

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey_rsa.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,15 @@ int32_t CryptoNative_RsaEncrypt(EVP_PKEY* pkey,
206206

207207
static bool ConfigureSignature(EVP_PKEY_CTX* ctx, RsaPaddingMode padding, const EVP_MD* digest)
208208
{
209+
210+
#pragma clang diagnostic push
211+
#pragma clang diagnostic ignored "-Wcast-qual"
212+
if (EVP_PKEY_CTX_set_signature_md(ctx, digest) <= 0)
213+
#pragma clang diagnostic pop
214+
{
215+
return false;
216+
}
217+
209218
if (padding == RsaPaddingPkcs1)
210219
{
211220
if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING) <= 0)
@@ -224,14 +233,6 @@ static bool ConfigureSignature(EVP_PKEY_CTX* ctx, RsaPaddingMode padding, const
224233
}
225234
}
226235

227-
#pragma clang diagnostic push
228-
#pragma clang diagnostic ignored "-Wcast-qual"
229-
if (EVP_PKEY_CTX_set_signature_md(ctx, digest) <= 0)
230-
#pragma clang diagnostic pop
231-
{
232-
return false;
233-
}
234-
235236
return true;
236237
}
237238

0 commit comments

Comments
 (0)