From 2ce15a95dae9a933140731a53afdb84889588be8 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 18 Jun 2019 16:04:12 +0200 Subject: [PATCH] crypto/aes/build.info: Fix AES assembler specs Two mistakes were made: 1. AES_ASM for x86 was misplaced 2. sse2 isn't applicable for x86_64 code Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/9177) --- crypto/aes/build.info | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/crypto/aes/build.info b/crypto/aes/build.info index 706ca58649..0ba1758d68 100644 --- a/crypto/aes/build.info +++ b/crypto/aes/build.info @@ -3,15 +3,14 @@ LIBS=../../libcrypto $AESASM=aes_core.c aes_cbc.c IF[{- !$disabled{asm} -}] $AESASM_x86=aes-586.s + $AESDEF_x86=AES_ASM $AESASM_x86_sse2=vpaes-x86.s aesni-x86.s - $AESDEF_x86_sse2=AES_ASM VPAES_ASM + $AESDEF_x86_sse2=VPAES_ASM $AESASM_x86_64=\ - aes-x86_64.s bsaes-x86_64.s \ + aes-x86_64.s vpaes-x86_64.s bsaes-x86_64.s aesni-x86_64.s \ aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s - $AESDEF_x86_64=AES_ASM BSAES_ASM - $AESASM_x86_64_sse2=vpaes-x86_64.s aesni-x86_64.s - $AESDEF_x86_64_sse2=VPAES_ASM + $AESDEF_x86_64=AES_ASM VPAES_ASM BSAES_ASM $AESASM_ia64=aes_core.c aes_cbc.c aes-ia64.s $AESDEF_ia64=AES_ASM -- 2.25.1