From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 13 Jun 2020 16:57:48 +0000 (+0100)
Subject: base/dispatch.c: Fix feature probe for AESNI.
X-Git-Tag: 2.6.2~1
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/9c3497462f0a2ed19a5ccff084e700a46f8f87f2

base/dispatch.c: Fix feature probe for AESNI.

Oh, this is embarrassing.  2.6.0 and 2.6.1 are broken on pre-AESNI
hardware.
---

diff --git a/base/dispatch.c b/base/dispatch.c
index 50c842e1..309be5c3 100644
--- a/base/dispatch.c
+++ b/base/dispatch.c
@@ -520,7 +520,7 @@ int cpu_feature_p(int feat)
 		 cpuid_feature_p(CPUID_1_D, CPUID1D_SSE2) &&
 		 xmm_registers_available_p());
     CASE_CPUFEAT(X86_AESNI, "x86:aesni",
-		 cpuid_feature_p(CPUID_1_D, CPUID1C_AESNI) &&
+		 cpuid_feature_p(CPUID_1_C, CPUID1C_AESNI) &&
 		 xmm_registers_available_p());
     CASE_CPUFEAT(X86_RDRAND, "x86:rdrand",
 		 cpuid_feature_p(CPUID_1_C, CPUID1C_RDRAND) &&