summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2016-05-25 18:29:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-25 18:29:43 +0000
commit5f51074adcd8cb0fd6f34797a921685c15cdb23e (patch)
tree2f563fe617a1af6a4cc77be3d62ae7465ed54e62
parentc042e7ed31f9ee2d85637320c0cd54b12bbb12fe (diff)
parent78f200490e2e7d18b7973b6f90cef350672c2be3 (diff)
downloadexternal_boringssl-5f51074adcd8cb0fd6f34797a921685c15cdb23e.zip
external_boringssl-5f51074adcd8cb0fd6f34797a921685c15cdb23e.tar.gz
external_boringssl-5f51074adcd8cb0fd6f34797a921685c15cdb23e.tar.bz2
Fix encoding bug in i2c_ASN1_INTEGER am: c313c682b6
am: 78f200490e * commit '78f200490e2e7d18b7973b6f90cef350672c2be3': Fix encoding bug in i2c_ASN1_INTEGER Change-Id: If689d4b584c9593b805518447497bcb2d2680671
-rw-r--r--src/crypto/asn1/a_int.c4
1 files changed, 3 insertions, 1 deletions
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 @@ int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)
{
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 @@ int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)
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--;