commit 925d3038b1b2bade5b0015b0a7307095323f3679
author Linux Build Service Account <lnxbuild@localhost> Thu Sep 08 13:40:35 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 08 13:40:35 2016 -0700
tree c2e9fcc67d1ba813ace91adf5fac2bda3a6a2803
parent eb92de4f4fb49e519faa7faf395930963dc8f052
parent 33c3e8cfe77b4902a419b103fe4802b8c464127d

Merge "Fix encoding bug in i2c_ASN1_INTEGER"

lib/openssl/crypto/asn1/a_int.c

diff --git a/lib/openssl/crypto/asn1/a_int.c b/lib/openssl/crypto/asn1/a_int.c
index 3348b87..3f38b28 100644
--- a/lib/openssl/crypto/asn1/a_int.c
+++ b/lib/openssl/crypto/asn1/a_int.c
@@ -124,6 +124,8 @@
 		{
 		ret=a->length;
 		i=a->data[0];
+		if (ret == 1 && i == 0)
+			neg = 0;
 		if (!neg && (i > 127)) {
 			pad=1;
 			pb=0;
@@ -157,7 +159,7 @@
 		p += a->length - 1;
 		i = a->length;
 		/* Copy zeros to destination as long as source is zero */
-		while(!*n) {
+		while(!*n && i > 1) {
 			*(p--) = 0;
 			n--;
 			i--;