Commit a2bb1836 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

modes/ocb128.c: fix misaligned access in ILP32 builds on 64-bit processors. 



One could have fixed the problem by arranging 64-bit alignment of
EVP_AES_OCB_CTX.aad_buf in evp/e_aes.c, but CRYPTO_ocb128_aad
prototype doesn't imply alignment and we have to honour it.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2994)
parent 08d09628

crypto/modes/ocb128.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad, 


        /* Sum_i = Sum_{i-1} xor ENCIPHER(K, A_i xor Offset_i) */

        aad_block = (OCB_BLOCK *)(aad + ((i - ctx->blocks_hashed - 1) * 16));

        ocb_block16_xor(&ctx->offset_aad, aad_block, &tmp1);

        ocb_block16_xor_misaligned(&ctx->offset_aad, aad_block, &tmp1);

        ctx->encrypt(tmp1.c, tmp2.c, ctx->keyenc);

        ocb_block16_xor(&ctx->sum, &tmp2, &ctx->sum);

    }