X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fe_aes_cbc_hmac_sha1.c;h=ec76393576800637b0035dd056cf821fd8f5a412;hp=717e388fc3eb1a9a3f272c16f7796a02447d5d67;hb=2893a302a9b6a70161d1859d985a52af11b2195d;hpb=55eb14da201cc35fe744a08718f5c2efb97f6155

diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index 717e388fc3..ec76393576 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -330,10 +330,18 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
 		len += 64+13;		/* 64 is HMAC header */
 		len *= 8;		/* convert to bits */
 		if (off<(64-8)) {
+#ifdef BSWAP4
+			blocks[i].d[15] = BSWAP4(len);
+#else
 			PUTU32(blocks[i].c+60,len);
+#endif
 			edges[i].blocks = 1;			
 		} else {
+#ifdef BSWAP4
+			blocks[i].d[31] = BSWAP4(len);
+#else
 			PUTU32(blocks[i].c+124,len);
+#endif
 			edges[i].blocks = 2;
 		}
 		edges[i].ptr = blocks[i].c;
@@ -344,6 +352,15 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
 
 	memset(blocks,0,sizeof(blocks));
 	for (i=0;i<x4;i++) {
+#ifdef BSWAP4
+		blocks[i].d[0] = BSWAP4(ctx->A[i]);	ctx->A[i] = key->tail.h0;
+		blocks[i].d[1] = BSWAP4(ctx->B[i]);	ctx->B[i] = key->tail.h1;
+		blocks[i].d[2] = BSWAP4(ctx->C[i]);	ctx->C[i] = key->tail.h2;
+		blocks[i].d[3] = BSWAP4(ctx->D[i]);	ctx->D[i] = key->tail.h3;
+		blocks[i].d[4] = BSWAP4(ctx->E[i]);	ctx->E[i] = key->tail.h4;
+		blocks[i].c[20] = 0x80;
+		blocks[i].d[15] = BSWAP4((64+20)*8);
+#else
 		PUTU32(blocks[i].c+0,ctx->A[i]);	ctx->A[i] = key->tail.h0;
 		PUTU32(blocks[i].c+4,ctx->B[i]);	ctx->B[i] = key->tail.h1;
 		PUTU32(blocks[i].c+8,ctx->C[i]);	ctx->C[i] = key->tail.h2;
@@ -351,6 +368,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
 		PUTU32(blocks[i].c+16,ctx->E[i]);	ctx->E[i] = key->tail.h4;
 		blocks[i].c[20] = 0x80;
 		PUTU32(blocks[i].c+60,(64+20)*8);
+#endif
 		edges[i].ptr = blocks[i].c;
 		edges[i].blocks = 1;
 	}