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

Only emit RSA_R_BAD_VERSION on bad RSAPrivateKey versions.

Browse Source 
I was a little bit too lazy in error handling here.

Change-Id: I9954957d41d610e715c1976a921dedeb8cb49d40
Reviewed-on: https://boringssl-review.googlesource.com/6240
Reviewed-by: Adam Langley <alangley@gmail.com>
This commit is contained in:
David Benjamin 2015-10-13 17:17:17 -04:00 committed by Adam Langley
parent 3398dbf279
commit ccf25177bd
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crypto/rsa/rsa_asn1.c
View File

@ -203,9 +203,17 @@ RSA *RSA_parse_private_key(CBS *cbs) {
CBS child;
uint64_t version;
if (!CBS_get_asn1(cbs, &child, CBS_ASN1_SEQUENCE) ||
!CBS_get_asn1_uint64(&child, &version) ||
(version != kVersionTwoPrime && version != kVersionMulti) ||
!parse_integer(&child, &ret->n) ||
!CBS_get_asn1_uint64(&child, &version)) {
OPENSSL_PUT_ERROR(RSA, RSA_R_BAD_ENCODING);
goto err;
}
if (version != kVersionTwoPrime && version != kVersionMulti) {
OPENSSL_PUT_ERROR(RSA, RSA_R_BAD_VERSION);
goto err;
}
if (!parse_integer(&child, &ret->n) ||
!parse_integer(&child, &ret->e) ||
!parse_integer(&child, &ret->d) ||
!parse_integer(&child, &ret->p) ||
@ -213,7 +221,6 @@ RSA *RSA_parse_private_key(CBS *cbs) {
!parse_integer(&child, &ret->dmp1) ||
!parse_integer(&child, &ret->dmq1) ||
!parse_integer(&child, &ret->iqmp)) {
OPENSSL_PUT_ERROR(RSA, RSA_R_BAD_VERSION);
goto err;
}