Commit 725c8887 authored by Bodo Möller's avatar Bodo Möller
Browse files

Finish SSL_peek/SSL_pending fixes.

parent a0aae68c

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 


  *) Fix ssl3_pending: If the record in s->s3->rrec is not of type

     SSL3_RT_APPLICATION_DATA, return 0.

     Similarly, change ssl2_pending to return 0 if SSL_in_init(s) is true.

     [Bodo Moeller]



  *) Fix SSL_peek:

ssl/s2_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ SSL_CIPHER *ssl2_get_cipher(unsigned int u) 


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)

ssl/s2_pkt.c

+0 −6
Original line number Diff line number Diff line
@@ -132,12 +132,6 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek) 
	int i;

	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:

	if (SSL_in_init(s) && !s->in_handshake)

		{