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

Fix OAEP with non-SHA hash functions.

Browse Source 
Due to merging our patched 1.0.1 code with the 1.0.2 code, some parts of
upstream's 25f93585a70fb05bb9f911884ab95e560f662a5d didn't make it into
the code.

https://code.google.com/p/chromium/issues/detail?id=397333

Change-Id: Iceb13e63a7ac91474fd39e7faad11fa52c56185d
Reviewed-on: https://boringssl-review.googlesource.com/1310
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Adam Langley 2014-07-24 17:16:16 -07:00 committed by Adam Langley
parent 77a942b7fe
commit 794bf6e0ce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/rsa/padding.c
View File

@ -350,7 +350,7 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(uint8_t *to, unsigned tlen,
const EVP_MD *md, const EVP_MD *mgf1md) { const EVP_MD *md, const EVP_MD *mgf1md) {
unsigned i, emlen, mdlen; unsigned i, emlen, mdlen;
uint8_t *db, *seed; uint8_t *db, *seed;
uint8_t *dbmask = NULL, seedmask[SHA_DIGEST_LENGTH]; uint8_t *dbmask = NULL, seedmask[EVP_MAX_MD_SIZE];
int ret = 0; int ret = 0;
if (md == NULL) { if (md == NULL) {
@ -390,7 +390,7 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(uint8_t *to, unsigned tlen,
} }
memset(db + mdlen, 0, emlen - flen - 2 * mdlen - 1); memset(db + mdlen, 0, emlen - flen - 2 * mdlen - 1);
db[emlen - flen - mdlen - 1] = 0x01; db[emlen - flen - mdlen - 1] = 0x01;
memcpy(db + emlen - flen - mdlen, from, (unsigned int)flen); memcpy(db + emlen - flen - mdlen, from, flen);
if (RAND_pseudo_bytes(seed, mdlen) <= 0) { if (RAND_pseudo_bytes(seed, mdlen) <= 0) {
return 0; return 0;
} }
@ -412,7 +412,7 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(uint8_t *to, unsigned tlen,
if (PKCS1_MGF1(seedmask, mdlen, db, emlen - mdlen, mgf1md) < 0) { if (PKCS1_MGF1(seedmask, mdlen, db, emlen - mdlen, mgf1md) < 0) {
goto out; goto out;
} }
for (i = 0; i < SHA_DIGEST_LENGTH; i++) { for (i = 0; i < mdlen; i++) {
seed[i] ^= seedmask[i]; seed[i] ^= seedmask[i];
} }
ret = 1; ret = 1;
@ -430,7 +430,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(uint8_t *to, unsigned tlen,
const EVP_MD *md, const EVP_MD *mgf1md) { const EVP_MD *md, const EVP_MD *mgf1md) {
unsigned i, dblen, mlen = -1, mdlen; unsigned i, dblen, mlen = -1, mdlen;
const uint8_t *maskeddb, *maskedseed; const uint8_t *maskeddb, *maskedseed;
uint8_t *db = NULL, seed[SHA_DIGEST_LENGTH], phash[SHA_DIGEST_LENGTH]; uint8_t *db = NULL, seed[EVP_MAX_MD_SIZE], phash[EVP_MAX_MD_SIZE];
int bad, looking_for_one_byte, one_index = 0; int bad, looking_for_one_byte, one_index = 0;
if (md == NULL) { if (md == NULL) {