Replace all uses of magic numbers when operating on OPENSSL_ia32_P[] by

meaningful constants in a private header file, so that reviewers can actually
get a chance to figure out what the code is attempting to do without knowing
all cpuid bits.

While there, turn it from an array of two 32-bit ints into a properly aligned
64-bit int.

Use of OPENSSL_ia32_P is now restricted to the assembler parts. C code will
now always use OPENSSL_cpu_caps() and check for the proper bits in the
whole 64-bit word it returns.

i386 tests and ok jsing@

1 files changed, 5 insertions, 4 deletions

diff --git a/src/lib/libcrypto/rc4/asm/rc4-586.pl b/src/lib/libcrypto/rc4/asm/rc4-586.pl
index 84f1a798cb..03f0cff467 100644
--- a/src/lib/libcrypto/rc4/asm/rc4-586.pl
+++ b/src/lib/libcrypto/rc4/asm/rc4-586.pl
@@ -189,7 +189,8 @@ if ($alt=0) {
         &jz     (&label("go4loop4"));
 
         &picmeup($out,"OPENSSL_ia32cap_P");
-        &bt     (&DWP(0,$out),26);      # check SSE2 bit [could have been MMX]
+        # check SSE2 bit [could have been MMX]
+        &bt     (&DWP(0,$out),"\$IA32CAP_BIT0_SSE2");
         &jnc    (&label("go4loop4"));
 
         &mov    ($out,&wparam(3))       if (!$alt);
@@ -312,7 +313,7 @@ $idx="edx";
         &xor    ("eax","eax");
         &mov    (&DWP(-4,$out),$idi);           # borrow key->y
 
-        &bt     (&DWP(0,$idx),20);              # check for bit#20
+        &bt     (&DWP(0,$idx),"\$IA32CAP_BIT0_INTELP4");
         &jc     (&label("c1stloop"));
 
 &set_label("w1stloop",16);
@@ -388,9 +389,9 @@ $idx="edx";
         &lea    ("eax",&DWP(&label("opts")."-".&label("pic_point"),"eax"));
         &picmeup("edx","OPENSSL_ia32cap_P");
         &mov    ("edx",&DWP(0,"edx"));
-        &bt     ("edx",20);
+        &bt     ("edx","\$IA32CAP_BIT0_INTELP4");
         &jc     (&label("1xchar"));
-        &bt     ("edx",26);
+        &bt     ("edx","\$IA32CAP_BIT0_SSE2");
         &jnc    (&label("ret"));
         &add    ("eax",25);
         &ret    ();