commit ccf25177bd78c60a5a8bcfa975b3ad573574f59e
author David Benjamin <davidben@chromium.org> Tue Oct 13 17:17:17 2015 -0400
committer Adam Langley <alangley@gmail.com> Mon Oct 26 20:27:01 2015 +0000
tree 12617e992e4921e0863e6a7e9e0729e220fd4758
parent 3398dbf27928cb0bcfa5601e63104d14e48e6bf0

Only emit RSA_R_BAD_VERSION on bad RSAPrivateKey versions.

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>

crypto/rsa/rsa_asn1.c

diff --git a/crypto/rsa/rsa_asn1.c b/crypto/rsa/rsa_asn1.c
index e3756ba..5d2a2b7 100644
--- a/crypto/rsa/rsa_asn1.c
+++ b/crypto/rsa/rsa_asn1.c
@@ -203,9 +203,17 @@
   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 @@
       !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;
   }