cryptlib.c: fix logical error.

f91926a2 · Andy Polyakov · 9282c335 · f91926a2
隐藏空白更改
内联并排

Showing with 7 addition and 4 deletion

crypto/cryptlib.c crypto/cryptlib.c +7 -4

未找到文件。
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -152,13 +152,16 @@ void OPENSSL_cpuid_setup(void)
 	if (!sscanf(env+off,"%lli",(long long *)&vec)) vec = strtoul(env+off,NULL,0);
 #endif
 	if (off) vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P)&~vec;
+	else if (env[0]==':') vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P);
 	OPENSSL_ia32cap_P[2] = 0;
 	if ((env=strchr(env,':'))) {
-	    off = (env[1]=='~')?2:1;
+	    unsigned int vecx;
-	    vec = strtoul(env+off,NULL,0);
+	    env++;
-	    if (off>1)	OPENSSL_ia32cap_P[2] &= ~vec;
+	    off = (env[0]=='~')?1:0;
-	    else	OPENSSL_ia32cap_P[2] = vec;
+	    vecx = strtoul(env+off,NULL,0);
+	    if (off)	OPENSSL_ia32cap_P[2] &= ~vecx;
+	    else	OPENSSL_ia32cap_P[2] = vecx;
 	}
    }
    else