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

Workarounds to make broken programs happy (such as s_client and s_server).

Browse Source
This commit is contained in:
Bodo Möller 2000-02-21 17:46:20 +00:00
parent a2a0158959
commit 1b8a8088a5
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ssl/s3_pkt.c
View File

@ -896,6 +896,21 @@ start:
SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
return(-1);
}
if (s->s3->rbuf.left == 0) /* no read-ahead left? */
{
BIO *bio;
/* In the case where we try to read application data
* the first time, but we trigger an SSL handshake, we
* return -1 with the retry option set. I do this
* otherwise renegotiation can cause nasty problems
* in the blocking world */ /* ? */
s->rwstate=SSL_READING;
bio=SSL_get_rbio(s);
BIO_clear_retry_flags(bio);
BIO_set_retry_read(bio);
return(-1);
}
}
}
/* we either finished a handshake or ignored the request,
@ -1006,30 +1021,21 @@ start:
return(-1);
}
#if 1 /* probably nonsense (does not work with readahead),
* but keep it for now anyway ... s_server relies on this */
{
BIO *bio;
/* In the case where we try to read application data
* the first time, but we trigger an SSL handshake, we
* return -1 with the retry option set. I do this
* otherwise renegotiation can cause nasty problems
* in the non-blocking world */ /* That's "non-non-blocking",
* I guess? When receiving a
* Hello Request, we have the
* same problem (e.g. in s_client),
* but it's really an application bug.
*/
s->rwstate=SSL_READING;
bio=SSL_get_rbio(s);
BIO_clear_retry_flags(bio);
BIO_set_retry_read(bio);
return(-1);
}
#else
if (s->s3->rbuf.left == 0) /* no read-ahead left? */
{
BIO *bio;
/* In the case where we try to read application data
* the first time, but we trigger an SSL handshake, we
* return -1 with the retry option set. I do this
* otherwise renegotiation can cause nasty problems
* in the blocking world */ /* ? */
s->rwstate=SSL_READING;
bio=SSL_get_rbio(s);
BIO_clear_retry_flags(bio);
BIO_set_retry_read(bio);
return(-1);
}
goto start;
#endif
}
switch (rr->type)