Commit 6657e68b authored by Felix Laurie von Massenbach's avatar Felix Laurie von Massenbach Committed by Dr. Stephen Henson
Browse files

Fix shadow declaration. 

(cherry picked from commit 1f61d8b5)
parent 23351c60

crypto/evp/e_aes_cbc_hmac_sha1.c

+3 −2
Original line number Diff line number Diff line
@@ -210,8 +210,6 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key, 
	u8		*IVs;

#if defined(BSWAP8)

	u64		seqnum;

#else

	unsigned int	carry,j;

#endif



	if (RAND_bytes((IVs=blocks[0].c),16*x4)<=0)	/* ask for IVs in bulk */
@@ -248,6 +246,9 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key, 
#endif

	for (i=0;i<x4;i++) {

		unsigned int len = (i==(x4-1)?last:frag);

#if !defined(BSWAP8)

		unsigned int carry, j;

#endif



		ctx->A[i] = key->md.h0;

		ctx->B[i] = key->md.h1;

crypto/evp/e_aes_cbc_hmac_sha256.c

+3 −2
Original line number Diff line number Diff line
@@ -206,8 +206,6 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key, 
	u8		*IVs;

#if defined(BSWAP8)

	u64		seqnum;

#else

	unsigned int	carry,j;

#endif



	if (RAND_bytes((IVs=blocks[0].c),16*x4)<=0)	/* ask for IVs in bulk */
@@ -244,6 +242,9 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key, 
#endif

	for (i=0;i<x4;i++) {

		unsigned int len = (i==(x4-1)?last:frag);

#if !defined(BSWAP8)

		unsigned int carry, j;

#endif



		ctx->A[i] = key->md.h[0];

		ctx->B[i] = key->md.h[1];