summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2016-05-16 08:34:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-16 08:34:09 +0000
commitc99a43cfb0b65eb6c96fa34b58f6f7c9d7986107 (patch)
treeb69b74c4fb107ea4323318f091a3f6bc94f40e96
parent67e4b08877196aaed1026660507da51729121522 (diff)
parentc79be54ba3206605350204e419e4078906456da6 (diff)
downloadexternal_boringssl-c99a43cfb0b65eb6c96fa34b58f6f7c9d7986107.zip
external_boringssl-c99a43cfb0b65eb6c96fa34b58f6f7c9d7986107.tar.gz
external_boringssl-c99a43cfb0b65eb6c96fa34b58f6f7c9d7986107.tar.bz2
Fix encoding bug in i2c_ASN1_INTEGER
am: c79be54ba3 * commit 'c79be54ba3206605350204e419e4078906456da6': Fix encoding bug in i2c_ASN1_INTEGER Change-Id: I9a5d0ad1bca0a396a44939a4aea60bf83acdce32
-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 9a56534..46855d9 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--;