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

size_t RSA_private_decrypt's input.

Browse Source 
Change-Id: If05761052e235b38d9798b2fe4d8ba44293af891
Reviewed-on: https://boringssl-review.googlesource.com/5944
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-09-19 13:35:39 -04:00 committed by Adam Langley
parent d98dc1311e
commit 79c59a30b5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/rsa/rsa.c
View File

@ -56,6 +56,7 @@
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <limits.h>
#include <string.h> #include <string.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -240,7 +241,7 @@ int RSA_decrypt(RSA *rsa, size_t *out_len, uint8_t *out, size_t max_out,
padding); padding);
} }
int RSA_private_decrypt(int flen, const uint8_t *from, uint8_t *to, RSA *rsa, int RSA_private_decrypt(size_t flen, const uint8_t *from, uint8_t *to, RSA *rsa,
int padding) { int padding) {
size_t out_len; size_t out_len;
@ -248,6 +249,10 @@ int RSA_private_decrypt(int flen, const uint8_t *from, uint8_t *to, RSA *rsa,
return -1; return -1;
} }
if (out_len > INT_MAX) {
OPENSSL_PUT_ERROR(RSA, ERR_R_OVERFLOW);
return -1;
}
return out_len; return out_len;
} }

2
include/openssl/rsa.h
View File

@ -164,7 +164,7 @@ OPENSSL_EXPORT int RSA_public_encrypt(int flen, const uint8_t *from,
* *
* WARNING: this function is dangerous because it breaks the usual return value * WARNING: this function is dangerous because it breaks the usual return value
* convention. Use |RSA_decrypt| instead. */ * convention. Use |RSA_decrypt| instead. */
OPENSSL_EXPORT int RSA_private_decrypt(int flen, const uint8_t *from, OPENSSL_EXPORT int RSA_private_decrypt(size_t flen, const uint8_t *from,
uint8_t *to, RSA *rsa, int padding); uint8_t *to, RSA *rsa, int padding);
/* RSA_message_index_PKCS1_type_2 performs the first step of a PKCS #1 padding /* RSA_message_index_PKCS1_type_2 performs the first step of a PKCS #1 padding