Commit 2928cb4c authored by Ben Laurie's avatar Ben Laurie Committed by Dr. Stephen Henson
Browse files

Fixups.

parent a33e6702

crypto/evp/c_allc.c

+0 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ void OpenSSL_add_all_ciphers(void) 
	EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");

	EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");

#endif

#endif



#ifndef OPENSSL_NO_CAMELLIA

	EVP_add_cipher(EVP_camellia_128_ecb());

ssl/d1_enc.c

+4 −4
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ int dtls1_enc(SSL *s, int send) 


	if (send)

		{

		if (EVP_MD_CTX_md(s->write_hash))

		if (s->write_hash)

			{

			mac_size=EVP_MD_CTX_size(s->write_hash);

			mac_size=EVP_MD_size(s->write_hash);

			if (mac_size < 0)

				return -1;

			}
@@ -162,9 +162,9 @@ int dtls1_enc(SSL *s, int send) 
		}

	else

		{

		if (EVP_MD_CTX_md(s->read_hash))

		if (s->read_hash)

			{

			mac_size=EVP_MD_CTX_size(s->read_hash);

			mac_size=EVP_MD_size(s->read_hash);

			if (mac_size < 0)

				return -1;

			}

ssl/d1_pkt.c

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ dtls1_process_record(SSL *s) 
	unsigned char md[EVP_MAX_MD_SIZE];

	int decryption_failed_or_bad_record_mac = 0;

	unsigned char *mac = NULL;

	int i;





	rr= &(s->s3->rrec);

ssl/s3_cbc.c

+6 −7
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ int tls1_cbc_remove_padding(const SSL* s, 
			    unsigned mac_size)

	{

	unsigned padding_length, good, to_check, i;

	const char has_explicit_iv =

		s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION;

	const char has_explicit_iv = s->version == DTLS1_VERSION;

	const unsigned overhead = 1 /* padding length byte */ +

				  mac_size +

				  (has_explicit_iv ? block_size : 0);
@@ -366,9 +365,9 @@ static void tls1_sha512_final_raw(void* ctx, unsigned char *md_out) 


/* ssl3_cbc_record_digest_supported returns 1 iff |ctx| uses a hash function

 * which ssl3_cbc_digest_record supports. */

char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx)

char ssl3_cbc_record_digest_supported(const EVP_MD *digest)

	{

	switch (ctx->digest->type)

	switch (digest->type)

		{

		case NID_md5:

		case NID_sha1:
@@ -402,7 +401,7 @@ char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx) 
 * a padding byte and MAC. (If the padding was invalid, it might contain the

 * padding too. ) */

void ssl3_cbc_digest_record(

	const EVP_MD_CTX *ctx,

	const EVP_MD *digest,

	unsigned char* md_out,

	size_t* md_out_size,

	const unsigned char header[13],
@@ -436,7 +435,7 @@ void ssl3_cbc_digest_record( 
	 * many possible overflows later in this function. */

	OPENSSL_assert(data_plus_mac_plus_padding_size < 1024*1024);



	switch (ctx->digest->type)

	switch (digest->type)

		{

		case NID_md5:

			MD5_Init((MD5_CTX*)md_state);
@@ -670,7 +669,7 @@ void ssl3_cbc_digest_record( 
		}



	EVP_MD_CTX_init(&md_ctx);

	EVP_DigestInit_ex(&md_ctx, ctx->digest, NULL /* engine */);

	EVP_DigestInit_ex(&md_ctx, digest, NULL /* engine */);

	if (is_sslv3)

		{

		/* We repurpose |hmac_pad| to contain the SSLv3 pad2 block. */

ssl/s3_enc.c

+4 −4
Original line number Diff line number Diff line
@@ -501,8 +501,8 @@ int ssl3_enc(SSL *s, int send) 


		rec->orig_len = rec->length;



		if (EVP_MD_CTX_md(s->read_hash) != NULL)

			mac_size = EVP_MD_CTX_size(s->read_hash);

		if (s->read_hash != NULL)

			mac_size = EVP_MD_size(s->read_hash);

		if ((bs != 1) && !send)

			return ssl3_cbc_remove_padding(s, rec, bs, mac_size);

		}
@@ -643,7 +643,7 @@ int ssl3_mac(SSL *ssl, unsigned char *md, int send) 
		/* Chop the digest off the end :-) */

		EVP_MD_CTX_init(&md_ctx);



		EVP_MD_CTX_copy_ex( &md_ctx,hash);

		EVP_DigestInit_ex( &md_ctx,hash, NULL);

		EVP_DigestUpdate(&md_ctx,mac_sec,md_size);

		EVP_DigestUpdate(&md_ctx,ssl3_pad_1,npad);

		EVP_DigestUpdate(&md_ctx,seq,8);
@@ -655,7 +655,7 @@ int ssl3_mac(SSL *ssl, unsigned char *md, int send) 
		EVP_DigestUpdate(&md_ctx,rec->input,rec->length);

		EVP_DigestFinal_ex( &md_ctx,md,NULL);



		EVP_MD_CTX_copy_ex( &md_ctx,hash);

		EVP_DigestInit_ex( &md_ctx,hash, NULL);

		EVP_DigestUpdate(&md_ctx,mac_sec,md_size);

		EVP_DigestUpdate(&md_ctx,ssl3_pad_2,npad);

		EVP_DigestUpdate(&md_ctx,md,md_size);