Commit 7aacd4c4 authored by Bodo Möller's avatar Bodo Möller
Browse files

fix ssl3_pending

parent e18ed57a

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]



  *) 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

config

+9 −0
Original line number Diff line number Diff line
@@ -310,6 +310,13 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in 
	exit 0

	;;



    *"CRAY T3E")

       echo "t3e-cray-unicosmk"; exit 0;

       ;;



    *CRAY*)

       echo "t90-cray-unicos"; exit 0;

       ;;

esac



#
@@ -591,6 +598,8 @@ EOF 
  mips-sony-newsos4) OUT="newsos4-gcc" ;;

  *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;

  *-*-cygwin) OUT="Cygwin" ;;

  t3e-cray-unicosmk) OUT="cray-t3e" ;;

  t90-cray-unicos) OUT="cray-t90-cc" ;;

  *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;

esac

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-2000 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
@@ -693,6 +693,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;

	}