From d9f22bc61f1434dc6be9affbb59bab3725dc64ce Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Mon, 29 Apr 2019 15:28:28 +0200 Subject: Align _gnutls_x86_cpuid_s as OPENSSL_ia32cap_P would be We were not setting the third array member correctly, though this didn't have any impact to previous implementations as they did not rely on it. This also moves away from the custom implementation of cpuid (which was limited), and we now rely on the compiler's version. This effectively enables support for SHA_NI. Signed-off-by: Nikos Mavrogiannopoulos --- cfg.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'cfg.mk') diff --git a/cfg.mk b/cfg.mk index f7ae6408fd..ff79dbf2ed 100644 --- a/cfg.mk +++ b/cfg.mk @@ -130,8 +130,6 @@ ASM_SOURCES_XXX := \ lib/accelerated/aarch64/XXX/sha1-armv8.s \ lib/accelerated/aarch64/XXX/sha256-armv8.s \ lib/accelerated/aarch64/XXX/sha512-armv8.s \ - lib/accelerated/x86/XXX/cpuid-x86_64.s \ - lib/accelerated/x86/XXX/cpuid-x86.s \ lib/accelerated/x86/XXX/ghash-x86_64.s \ lib/accelerated/x86/XXX/aesni-x86_64.s \ lib/accelerated/x86/XXX/aesni-x86.s \ @@ -154,10 +152,10 @@ asm-sources: $(ASM_SOURCES_ELF) $(ASM_SOURCES_COFF) $(ASM_SOURCES_MACOSX) lib/ac asm-sources-clean: rm -f $(ASM_SOURCES_ELF) $(ASM_SOURCES_COFF) $(ASM_SOURCES_MACOSX) lib/accelerated/x86/files.mk -X86_FILES=XXX/aesni-x86.s XXX/cpuid-x86.s XXX/sha1-ssse3-x86.s \ +X86_FILES=XXX/aesni-x86.s XXX/sha1-ssse3-x86.s \ XXX/sha256-ssse3-x86.s XXX/sha512-ssse3-x86.s XXX/aes-ssse3-x86.s -X86_64_FILES=XXX/aesni-x86_64.s XXX/cpuid-x86_64.s XXX/ghash-x86_64.s \ +X86_64_FILES=XXX/aesni-x86_64.s XXX/ghash-x86_64.s \ XXX/sha1-ssse3-x86_64.s XXX/sha512-ssse3-x86_64.s XXX/aes-ssse3-x86_64.s \ XXX/aesni-gcm-x86_64.s XXX/sha256-ssse3-x86_64.s -- cgit v1.2.1