generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The fix for PR#1949 unfortunately broke cases where the BIO_CTRL_WPENDING

Browse Source 
ctrl is incorrectly implemented (e.g. some versions of Apache). As a workaround
call both BIO_CTRL_INFO and BIO_CTRL_WPENDING if it returns zero. This should
both address the original bug and retain compatibility with the old behaviour.
This commit is contained in:
Dr. Stephen Henson 2010-01-24 13:54:20 +00:00
parent ba64ae6cd1
commit 21a5c040e5
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ssl/s3_srvr.c
View File

@ -484,7 +484,21 @@ int ssl3_accept(SSL *s)
case SSL3_ST_SW_FLUSH:
/* number of bytes to be flushed */
num1=BIO_ctrl(s->wbio,BIO_CTRL_WPENDING,0,NULL);
/* This originally and incorrectly called BIO_CTRL_INFO
* The reason why this is wrong is mentioned in PR#1949.
* Unfortunately, as suggested in that bug some
* versions of Apache unconditionally return 0
* for BIO_CTRL_WPENDING meaning we don't correctly
* flush data and some operations, like renegotiation,
* don't work. Other software may also be affected so
* call BIO_CTRL_INFO to retain compatibility with
* previous behaviour and BIO_CTRL_WPENDING if we
* get zero to address the PR#1949 case.
*/
num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL);
if (num1 == 0)
num1=BIO_ctrl(s->wbio,BIO_CTRL_WPENDING,0,NULL);
if (num1 > 0)
{
s->rwstate=SSL_WRITING;