kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidy up pkey_rsa_verify_recover.

Browse Source 
RSA_verify_raw is the same as RSA_public_decrypt and fits the calling
convention better. This also avoids the extra copy.

Change-Id: Ib7e3152af26872440290a289f178c9a1d9bc673f
Reviewed-on: https://boringssl-review.googlesource.com/15826
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2017-05-02 14:54:09 -04:00 committed by Adam Langley
parent 79d18bc4dd
commit 2baccac82f
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crypto/evp/p_rsa.c
View File

@ -251,19 +251,9 @@ static int pkey_rsa_verify_recover(EVP_PKEY_CTX *ctx, uint8_t *out,
return 0; return 0;
} }
if (!setup_tbuf(rctx, ctx)) {
return 0;
}
if (rctx->md == NULL) { if (rctx->md == NULL) {
const int ret = RSA_public_decrypt(sig_len, sig, rctx->tbuf, return RSA_verify_raw(rsa, out_len, out, *out_len, sig, sig_len,
ctx->pkey->pkey.rsa, rctx->pad_mode); rctx->pad_mode);
if (ret < 0) {
return 0;
}
*out_len = ret;
OPENSSL_memcpy(out, rctx->tbuf, *out_len);
return 1;
} }
if (rctx->pad_mode != RSA_PKCS1_PADDING) { if (rctx->pad_mode != RSA_PKCS1_PADDING) {
@ -276,7 +266,8 @@ static int pkey_rsa_verify_recover(EVP_PKEY_CTX *ctx, uint8_t *out,
uint8_t *asn1_prefix; uint8_t *asn1_prefix;
size_t asn1_prefix_len; size_t asn1_prefix_len;
int asn1_prefix_allocated; int asn1_prefix_allocated;
if (!RSA_add_pkcs1_prefix(&asn1_prefix, &asn1_prefix_len, if (!setup_tbuf(rctx, ctx) ||
!RSA_add_pkcs1_prefix(&asn1_prefix, &asn1_prefix_len,
&asn1_prefix_allocated, EVP_MD_type(rctx->md), &asn1_prefix_allocated, EVP_MD_type(rctx->md),
kDummyHash, hash_len)) { kDummyHash, hash_len)) {
return 0; return 0;