summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2016-05-25 18:23:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-25 18:23:19 +0000
commit78f200490e2e7d18b7973b6f90cef350672c2be3 (patch)
tree2f563fe617a1af6a4cc77be3d62ae7465ed54e62
parentc042e7ed31f9ee2d85637320c0cd54b12bbb12fe (diff)
parentc313c682b677792ce384047e4a44812c218e29c9 (diff)
downloadboringssl-78f200490e2e7d18b7973b6f90cef350672c2be3.tar.gz
Fix encoding bug in i2c_ASN1_INTEGER
am: c313c682b6 * commit 'c313c682b677792ce384047e4a44812c218e29c9': Fix encoding bug in i2c_ASN1_INTEGER Change-Id: I4a6e0743464d3305d4d043dfab54790ac8baf49a
-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 2ecccc53..16b89507 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--;