Commit 304d9042 authored by Bodo Möller's avatar Bodo Möller
Browse files

fix ssl3_pending

parent bfaa8a89

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ 
         *) applies to 0.9.6a ... 0.9.6d and 0.9.7

         +) applies to 0.9.7 only



  *) Fix ssl3_pending() (ssl/s3_lib.c) to prevent SSL_pending() from

     returning non-zero before the data has been completely received

     when using non-blocking I/O.

     [Bodo Moeller; problem pointed out by John Hughes]



  *) Some of the ciphers missed the strength entry (SSL_LOW etc).

     [Ben Laurie, Lutz Jaenicke]

LICENSE

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  ---------------



/* ====================================================================

 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

ssl/s3_lib.c

+4 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
 * [including the GNU Public Licence.]

 */

/* ====================================================================

 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -943,6 +943,9 @@ SSL_CIPHER *ssl3_get_cipher(unsigned int u) 


int ssl3_pending(SSL *s)

	{

	if (s->rstate == SSL_ST_READ_BODY)

		return 0;

	

	return (s->s3->rrec.type == SSL3_RT_APPLICATION_DATA) ? s->s3->rrec.length : 0;

	}