summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2016-02-29 08:01:05 -0800
committerJessica Wagantall <jwagantall@cyngn.com>2016-07-08 16:23:16 -0700
commit5d8b3148e99c4fe6ab398c8ce8f1348ce0236e78 (patch)
tree5c5998cb40c883d711b294bc82700b23665c0a96
parent93ac22ad1244b252d9b154b3489e301c4b9052b5 (diff)
downloadexternal_boringssl-stable/cm-13.0-ZNH2KB.zip
external_boringssl-stable/cm-13.0-ZNH2KB.tar.gz
external_boringssl-stable/cm-13.0-ZNH2KB.tar.bz2
Fix encoding bug in i2c_ASN1_INTEGERstable/cm-13.0-ZNH2KB
(Imported from upstream's 3661bb4e7934668bd99ca777ea8b30eedfafa871.) Fix bug where i2c_ASN1_INTEGER mishandles zero if it is marked as negative. Thanks to Huzaifa Sidhpurwala <huzaifas@redhat.com> and Hanno Böck <hanno@hboeck.de> for reporting this issue. BUG=590615 Ticket: CYNGNOS-3020 (cherry-picked from c4eec0c16b02c97a62a95b6a08656c3a9ddb6baa) Bug: 28175332 Change-Id: I8959e8ae01510a5924862a3f353be23130eee554 Reviewed-on: https://boringssl-review.googlesource.com/7199 Reviewed-by: David Benjamin <davidben@google.com> (cherry picked from commit 33ce65e3fe4122e5f83e97bae4b110398a024002)
-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--;