The first step towards a SSL_peek fix.
The main thing to verify about these changes is that nothing at all has changed, as far as behaviour is concerned (except that some SSLerr() invocations now have a different function code): SSL_read (ssl2_read, ssl3_read) behaves exactly as before, and SSL_peek refuses to do any work exactly as before. But now the functions actually doing the work have a 'peek' flag, so it should be easy to change them to behave accordingly.
This commit is contained in:
@@ -365,7 +365,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
|
||||
while (s->init_num < 4)
|
||||
{
|
||||
i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],
|
||||
4 - s->init_num);
|
||||
4 - s->init_num, 0);
|
||||
if (i <= 0)
|
||||
{
|
||||
s->rwstate=SSL_READING;
|
||||
@@ -434,7 +434,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
|
||||
n=s->s3->tmp.message_size;
|
||||
while (n > 0)
|
||||
{
|
||||
i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],n);
|
||||
i=ssl3_read_bytes(s,SSL3_RT_HANDSHAKE,&p[s->init_num],n,0);
|
||||
if (i <= 0)
|
||||
{
|
||||
s->rwstate=SSL_READING;
|
||||
|
Reference in New Issue
Block a user