From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Mon, 2 Apr 2018 07:13:49 +0000 (+0200)
Subject: Fix range checks with -offset and -length in asn1parse
X-Git-Tag: OpenSSL_1_1_0i~213
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=faddc62b3e657aeb90f4a47e46aeba633964306a;p=oweals%2Fopenssl.git

Fix range checks with -offset and -length in asn1parse

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/5826)

(cherry picked from commit 16e1eea6a67c85c9d786f3c4448182b1aca101b8)
---

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 34f987d5ce..3b80b77e8e 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -244,14 +244,14 @@ int asn1parse_main(int argc, char **argv)
         num = tmplen;
     }
 
-    if (offset >= num) {
+    if (offset < 0 || offset >= num) {
         BIO_printf(bio_err, "Error: offset too large\n");
         goto end;
     }
 
     num -= offset;
 
-    if ((length == 0) || ((long)length > num))
+    if (length == 0 || length > (unsigned int)num)
         length = (unsigned int)num;
     if (derout) {
         if (BIO_write(derout, str + offset, length) != (int)length) {