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

Finish SSL_peek/SSL_pending fixes.

Browse Source
This commit is contained in:
Bodo Möller 2000-12-26 12:07:23 +00:00
parent a0aae68cf6
commit 725c88879c
3 changed files with 2 additions and 7 deletions

1
CHANGES

@ -146,6 +146,7 @@
*) Fix ssl3_pending: If the record in s->s3->rrec is not of type *) Fix ssl3_pending: If the record in s->s3->rrec is not of type
SSL3_RT_APPLICATION_DATA, return 0. SSL3_RT_APPLICATION_DATA, return 0.
Similarly, change ssl2_pending to return 0 if SSL_in_init(s) is true.
[Bodo Moeller] [Bodo Moeller]
*) Fix SSL_peek: *) Fix SSL_peek:

2
ssl/s2_lib.c

@ -260,7 +260,7 @@ SSL_CIPHER *ssl2_get_cipher(unsigned int u)
int ssl2_pending(SSL *s) int ssl2_pending(SSL *s)
{ {
return(s->s2->ract_data_length); return SSL_in_init(s) ? 0 : s->s2->ract_data_length;
} }
int ssl2_new(SSL *s) int ssl2_new(SSL *s)

6
ssl/s2_pkt.c

@ -132,12 +132,6 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek)
int i; int i;
unsigned int mac_size=0; unsigned int mac_size=0;
if (peek)
{
SSLerr(SSL_F_SSL2_READ_INTERNAL, SSL_R_FIXME); /* proper implementation not yet completed */
return -1;
}
ssl2_read_again: ssl2_read_again:
if (SSL_in_init(s) && !s->in_handshake) if (SSL_in_init(s) && !s->in_handshake)
{ {