diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-08-20 22:18:14 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-08-20 22:18:14 +0200 |
| commit | 2893a302a9b6a70161d1859d985a52af11b2195d (patch) | |
| tree | 315af2df6782548b543be7a46dd46eb548bb942f /crypto/evp/e_aes_cbc_hmac_sha256.c | |
| parent | 55eb14da201cc35fe744a08718f5c2efb97f6155 (diff) | |
crypto/evp/e_aes_cbc_hmac_sha[1|256].c: fix compiler warnings.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'crypto/evp/e_aes_cbc_hmac_sha256.c')
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha256.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index 447321266f..e3156039c6 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -329,10 +329,18 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *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; @@ -343,6 +351,18 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *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.h[0]; + blocks[i].d[1] = BSWAP4(ctx->B[i]); ctx->B[i] = key->tail.h[1]; + blocks[i].d[2] = BSWAP4(ctx->C[i]); ctx->C[i] = key->tail.h[2]; + blocks[i].d[3] = BSWAP4(ctx->D[i]); ctx->D[i] = key->tail.h[3]; + blocks[i].d[4] = BSWAP4(ctx->E[i]); ctx->E[i] = key->tail.h[4]; + blocks[i].d[5] = BSWAP4(ctx->F[i]); ctx->F[i] = key->tail.h[5]; + blocks[i].d[6] = BSWAP4(ctx->G[i]); ctx->G[i] = key->tail.h[6]; + blocks[i].d[7] = BSWAP4(ctx->H[i]); ctx->H[i] = key->tail.h[7]; + blocks[i].c[32] = 0x80; + blocks[i].d[15] = BSWAP4((64+32)*8); +#else PUTU32(blocks[i].c+0,ctx->A[i]); ctx->A[i] = key->tail.h[0]; PUTU32(blocks[i].c+4,ctx->B[i]); ctx->B[i] = key->tail.h[1]; PUTU32(blocks[i].c+8,ctx->C[i]); ctx->C[i] = key->tail.h[2]; @@ -353,6 +373,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key, PUTU32(blocks[i].c+28,ctx->H[i]); ctx->H[i] = key->tail.h[7]; blocks[i].c[32] = 0x80; PUTU32(blocks[i].c+60,(64+32)*8); +#endif edges[i].ptr = blocks[i].c; edges[i].blocks = 1; } |