Commit 0ac51fcf authored by Bodo Möller's avatar Bodo Möller
Browse files

emtpy fragments are not necessary for SSL_eNULL 

(but noone uses it anyway)
parent 01a9310b

ssl/s3_enc.c

+8 −2
Original line number Diff line number Diff line
@@ -368,11 +368,17 @@ int ssl3_setup_key_block(SSL *s) 
		 */

		s->s3->need_empty_fragments = 1;



 		if (s->session->cipher != NULL)

			{

			if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_eNULL)

 				s->s3->need_empty_fragments = 0;

 			

#ifndef NO_RC4

		if ((s->session->cipher != NULL) && ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_RC4))

 			if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_RC4)

 				s->s3->need_empty_fragments = 0;

#endif

 			}

 		}

		

	return(1);

err:

ssl/t1_enc.c

+8 −2
Original line number Diff line number Diff line
@@ -440,11 +440,17 @@ printf("\nkey block\n"); 
		 */

		s->s3->need_empty_fragments = 1;



		if (s->session->cipher != NULL)

			{

			if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_eNULL)

				s->s3->need_empty_fragments = 0;

			

#ifndef NO_RC4

		if ((s->session->cipher != NULL) && ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_RC4))

			if ((s->session->cipher->algorithms & SSL_ENC_MASK) == SSL_RC4)

				s->s3->need_empty_fragments = 0;

#endif

			}

		}

		

	return(1);

err: