commit 2fddbe3348fcf4b087efcc4d44c1d466fccaf462
author Adam Langley <agl@google.com> Wed May 25 18:36:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 18:36:39 2016 +0000
tree 2f563fe617a1af6a4cc77be3d62ae7465ed54e62
parent eea801cc4bb43e1fbf2e547ee8b94402264f4396
parent 5f51074adcd8cb0fd6f34797a921685c15cdb23e

Fix encoding bug in i2c_ASN1_INTEGER am: c313c682b6 am: 78f200490e
am: 5f51074adc

* commit '5f51074adcd8cb0fd6f34797a921685c15cdb23e':
  Fix encoding bug in i2c_ASN1_INTEGER

Change-Id: I6842c9a5ea94ba4358ea69076a8f9cc6d8b512ec

src/crypto/asn1/a_int.c

diff --git a/src/crypto/asn1/a_int.c b/src/crypto/asn1/a_int.c
index 2ecccc5..16b8950 100644
--- a/src/crypto/asn1/a_int.c
+++ b/src/crypto/asn1/a_int.c
@@ -125,6 +125,8 @@
 		{
 		ret=a->length;
 		i=a->data[0];
+		if (ret == 1 && i == 0)
+			neg=0;
 		if (!neg && (i > 127)) {
 			pad=1;
 			pb=0;
@@ -158,7 +160,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--;