Apply all the recent changes from 0.9.6-stable.

This commit is contained in:
Richard Levitte
2002-05-08 15:54:01 +00:00
parent 66ae107a14
commit e27fd320fc
17 changed files with 105 additions and 37 deletions

View File

@@ -850,7 +850,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
r = BIO_nwrite0(io1, &dataptr);
assert(r > 0);
if (r < num)
if (r < (int)num)
num = r;
r = BIO_read(io2, dataptr, (int)num);
if (r != (int)num) /* can't happen */