The branch OpenSSL_1_0_2-stable has been updated
via 82ff31d3e78413677023ac04a4a5ff94f2371a24 (commit)
from 477e40b48c5a2d5f9ba597cea2f2e2eb77e9347a (commit)
- Log -----------------------------------------------------------------
commit 82ff31d3e78413677023ac04a4a5ff94f2371a24
Author: Bernd Edlinger <[email protected]>
Date: Mon Apr 2 09:13:49 2018 +0200
Fix range checks with -offset and -length in asn1parse
Reviewed-by: Rich Salz <[email protected]>
Reviewed-by: Matthias St. Pierre <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/5826)
(cherry picked from commit 16e1eea6a67c85c9d786f3c4448182b1aca101b8)
-----------------------------------------------------------------------
Summary of changes:
apps/asn1pars.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 55ecd7c..6e7ed28 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -327,14 +327,14 @@ int 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) {
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
