diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-01-26 19:47:37 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-01-26 19:47:37 +0000 |
| commit | d5e7f2f2c3262c0dbf21363259b0477082c7b98e (patch) | |
| tree | 0635805e77e1f11e97b7859398501cce0e743e46 /ssl/s3_clnt.c | |
| parent | 1bfdbd8e75a70ca2d59e868f0b8947b661f709fd (diff) | |
| download | openssl-d5e7f2f2c3262c0dbf21363259b0477082c7b98e.zip openssl-d5e7f2f2c3262c0dbf21363259b0477082c7b98e.tar.gz openssl-d5e7f2f2c3262c0dbf21363259b0477082c7b98e.tar.bz2 | |
PR: 1949
Submitted by: steve@openssl.org
More robust fix and workaround for PR#1949. Don't try to work out if there
is any write pending data as this can be unreliable: always flush.
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index af8fe2a..44b698c 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -184,7 +184,6 @@ int ssl3_connect(SSL *s) { BUF_MEM *buf=NULL; unsigned long Time=(unsigned long)time(NULL); - long num1; void (*cb)(const SSL *ssl,int type,int val)=NULL; int ret= -1; int new_state,state,skip=0; @@ -520,16 +519,13 @@ int ssl3_connect(SSL *s) break; case SSL3_ST_CW_FLUSH: - /* number of bytes to be flushed */ - num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL); - if (num1 > 0) + s->rwstate=SSL_WRITING; + if (BIO_flush(s->wbio) <= 0) { - s->rwstate=SSL_WRITING; - num1=BIO_flush(s->wbio); - if (num1 <= 0) { ret= -1; goto end; } - s->rwstate=SSL_NOTHING; + ret= -1; + goto end; } - + s->rwstate=SSL_NOTHING; s->state=s->s3->tmp.next_state; break; |