d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ossl: Expose more CPUID bits in OPENSSL_ia32cap_P

Browse Source 
This is needed to let OpenSSL 3.1 routines detect VAES and VPCLMULQDQ
extensions.  The intent is to import ASM routines which implement
AES-GCM using VEX-prefixed AES-NI instructions.

No functional change intended.

Sponsored by:	Stormshield
Sponsored by:	Klara, Inc.
MFC after:	3 months
Differential Revision:	https://reviews.freebsd.org/D39782
This commit is contained in:
Mark Johnston 2023-06-02 11:57:38 -04:00
parent 7811cca872
commit 9ad8dc721e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/crypto/openssl/ossl_x86.c
View File

@ -47,7 +47,7 @@
* [0] = cpu_feature but with a few custom bits
* [1] = cpu_feature2 but with AMD XOP in bit 11
* [2] = cpu_stdext_feature
* [3] = 0
* [3] = cpu_stdext_feature2
*/
unsigned int OPENSSL_ia32cap_P[4];
#define AESNI_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32)))
@ -117,6 +117,7 @@ ossl_cpuid(struct ossl_softc *sc)
OPENSSL_ia32cap_P[1] &= ~(CPUID2_AVX | AMDID2_XOP | CPUID2_FMA);
OPENSSL_ia32cap_P[2] &= ~CPUID_STDEXT_AVX2;
}
OPENSSL_ia32cap_P[3] = cpu_stdext_feature2;
if (!AESNI_CAPABLE) {
sc->has_aes = false;