Commit 38b08590 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

In asn1_d2i_read_bio, don't assume BIO_read will 

return the requested number of bytes when reading
content.
parent 27498a33

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.6h and 0.9.7  [XX xxx 2002]



  *) In asn1_d2i_read_bio() repeatedly call BIO_read() until all content

     octets have been read, EOF or an error occurs. Without this change

     some truncated ASN1 structures will not produce an error.

     [Steve Henson]



  *) Disable Heimdal support, since it hasn't been fully implemented.

     Still give the possibility to force the use of Heimdal, but with

     warnings and a request that patches get sent to openssl-dev.

crypto/asn1/a_d2i_fp.c

+10 −5
Original line number Diff line number Diff line
@@ -226,13 +226,18 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb) 
					ASN1err(ASN1_F_ASN1_D2I_BIO,ERR_R_MALLOC_FAILURE);

					goto err;

					}

				while (want > 0)

					{

					i=BIO_read(in,&(b->data[len]),want);

					if (i <= 0)

						{

					ASN1err(ASN1_F_ASN1_D2I_BIO,ASN1_R_NOT_ENOUGH_DATA);

						ASN1err(ASN1_F_ASN1_D2I_BIO,

						    ASN1_R_NOT_ENOUGH_DATA);

						goto err;

						}

					len+=i;

					want -= i;

					}

				}

			off+=(int)c.slen;

			if (eos <= 0)