From e11485d8aaf3818801c1c7586a97a34ef5230be9 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 28 Apr 2019 05:03:56 +0000
Subject: Avoid an undefined shift in ASN1_INTEGER_get().

Fixes oss-fuzz issue #13804

ok beck, jsing
---
 src/lib/libcrypto/asn1/a_int.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c
index 1b2ebfb3a9..d14bd7959b 100644
--- a/src/lib/libcrypto/asn1/a_int.c
+++ b/src/lib/libcrypto/asn1/a_int.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_int.c,v 1.33 2019/03/26 09:15:07 jsing Exp $ */
+/* $OpenBSD: a_int.c,v 1.34 2019/04/28 05:03:56 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -418,7 +418,7 @@ long
 ASN1_INTEGER_get(const ASN1_INTEGER *a)
 {
 	int neg = 0, i;
-	long r = 0;
+	unsigned long r = 0;
 
 	if (a == NULL)
 		return (0L);
@@ -442,9 +442,13 @@ ASN1_INTEGER_get(const ASN1_INTEGER *a)
 		r <<= 8;
 		r |= (unsigned char)a->data[i];
 	}
+
+	if (r > LONG_MAX)
+		return -1;
+
 	if (neg)
-		r = -r;
-	return (r);
+		return -(long)r;
+	return (long)r;
 }
 
 ASN1_INTEGER *
-- 
cgit v1.2.3-55-g6feb