diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-03-13 19:22:41 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-03-13 19:22:41 +0000 |
| commit | 6a599222bb564010b80b78eef3f2b6ba6c8db14a (patch) | |
| tree | 909a7c21b7df72ae8c08b80b468a4dd75b3820be /crypto/openssl/ssl/s2_srvr.c | |
| parent | c5af82e51782b019d13e562a07c17dc19a282de2 (diff) | |
| parent | f7a1b4761cf3f798e1b42d703d38221b47ce1eec (diff) | |
| download | src-6a599222bb564010b80b78eef3f2b6ba6c8db14a.tar.gz src-6a599222bb564010b80b78eef3f2b6ba6c8db14a.zip | |
Merge OpenSSL 0.9.8m into head.
This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL. The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.
MFC after: 3 weeks
Notes
Notes:
svn path=/head/; revision=205128
Diffstat (limited to 'crypto/openssl/ssl/s2_srvr.c')
| -rw-r--r-- | crypto/openssl/ssl/s2_srvr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/ssl/s2_srvr.c b/crypto/openssl/ssl/s2_srvr.c index 50d55e6bf14c..01d62fad1165 100644 --- a/crypto/openssl/ssl/s2_srvr.c +++ b/crypto/openssl/ssl/s2_srvr.c @@ -267,7 +267,7 @@ int ssl2_accept(SSL *s) case SSL2_ST_SEND_SERVER_VERIFY_C: /* get the number of bytes to write */ num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL); - if (num1 != 0) + if (num1 > 0) { s->rwstate=SSL_WRITING; num1=BIO_flush(s->wbio); |