From 2667162d33ab21b6477f224040106c1d460e9249 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sat, 23 Jul 2011 12:10:26 +0000 Subject: cryptlib.c: OPENSSL_ia32cap environment variable to interpret ~ as cpuid mask. --- crypto/cryptlib.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'crypto/cryptlib.c') diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index d4b236284e..8a8fac3d13 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -144,12 +144,15 @@ void OPENSSL_cpuid_setup(void) if (trigger) return; trigger=1; - if ((env=getenv("OPENSSL_ia32cap"))) + if ((env=getenv("OPENSSL_ia32cap"))) { + int off = (env[0]=='~')?1:0; #if defined(_WIN32) - { if (!sscanf(env,"%I64i",&vec)) vec = strtoul(env,NULL,0); } + if (!sscanf(env+off,"%I64i",&vec)) vec = strtoul(env+off,NULL,0); #else - vec = strtoull(env,NULL,0); + vec = strtoull(env+off,NULL,0); #endif + if (off) vec = OPENSSL_ia32_cpuid()&~vec; + } else vec = OPENSSL_ia32_cpuid(); -- cgit v1.2.3