Commit 4ea70191 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

ssl/[d1|s3]_pkt.c: harmomize orig_len handling. 

(cherry picked from commit 8545f73b)
parent 59b1129e

ssl/d1_pkt.c

+3 −1
Original line number Diff line number Diff line
@@ -362,7 +362,6 @@ dtls1_process_record(SSL *s) 


	/* decrypt in place in 'rr->input' */

	rr->data=rr->input;

	orig_len=rr->length;



	enc_err = s->method->ssl3_enc->enc(s,0);

	/* enc_err is:
@@ -394,6 +393,9 @@ printf("\n"); 
		mac_size=EVP_MD_size(s->read_hash);

		OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE);



		/* kludge: *_cbc_remove_padding passes padding length in rr->type */

		orig_len = rr->length+((unsigned int)rr->type>>8);



		/* orig_len is the length of the record before any padding was

		 * removed. This is public information, as is the MAC in use,

		 * therefore we can safely process the record in a different

ssl/s3_pkt.c

+3 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ again: 


	/* decrypt in place in 'rr->input' */

	rr->data=rr->input;

	orig_len=rr->length;



	enc_err = s->method->ssl3_enc->enc(s,0);

	/* enc_err is:
@@ -382,6 +381,9 @@ printf("\n"); 
		mac_size=EVP_MD_size(s->read_hash);

		OPENSSL_assert(mac_size <= EVP_MAX_MD_SIZE);



		/* kludge: *_cbc_remove_padding passes padding length in rr->type */

		orig_len = rr->length+((unsigned int)rr->type>>8);



		/* orig_len is the length of the record before any padding was

		 * removed. This is public information, as is the MAC in use,

		 * therefore we can safely process the record in a different