From: Andy Polyakov Date: Fri, 28 Apr 2017 08:06:35 +0000 (+0200) Subject: asn1/a_int.c: fix "next negative minimum" corner case in c2i_ibuf. X-Git-Tag: OpenSSL_1_1_1-pre1~1625 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1e93d619b78832834ae32f5c0c1b0e466267f72d;p=oweals%2Fopenssl.git asn1/a_int.c: fix "next negative minimum" corner case in c2i_ibuf. "Next" refers to negative minimum "next" to one presentable by given number of bytes. For example, -128 is negative minimum presentable by one byte, and -256 is "next" one. Thanks to Kazuki Yamaguchi for report, GH#3339 Reviewed-by: Rich Salz Reviewed-by: Richard Levitte --- diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index e154343925..217650a036 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -167,10 +167,21 @@ static size_t c2i_ibuf(unsigned char *b, int *pneg, } return 1; } - if (p[0] == 0 || p[0] == 0xFF) + + pad = 0; + if (p[0] == 0) { pad = 1; - else - pad = 0; + } else if (p[0] == 0xFF) { + size_t i; + + /* + * Special case [of "one less minimal negative" for given length]: + * if any other bytes non zero it was padded, otherwise not. + */ + for (pad = 0, i = 1; i < plen; i++) + pad |= p[i]; + pad = pad != 0 ? 1 : 0; + } /* reject illegal padding: first two octets MSB can't match */ if (pad && (neg == (p[1] & 0x80))) { ASN1err(ASN1_F_C2I_IBUF, ASN1_R_ILLEGAL_PADDING);