Import OpenSSL 1.0.1g

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/libcrypto/x86cpuid.pl b/src/lib/libcrypto/x86cpuid.pl
index 39fd8f2293..b270b44337 100644
--- a/src/lib/libcrypto/x86cpuid.pl
+++ b/src/lib/libcrypto/x86cpuid.pl
@@ -67,6 +67,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
         &inc    ("esi");                # number of cores
 
         &mov    ("eax",1);
+        &xor    ("ecx","ecx");
         &cpuid  ();
         &bt     ("edx",28);
         &jnc    (&label("generic"));
@@ -91,6 +92,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
 
 &set_label("nocacheinfo");
         &mov    ("eax",1);
+        &xor    ("ecx","ecx");
         &cpuid  ();
         &and    ("edx",0xbfefffff);     # force reserved bits #20, #30 to 0
         &cmp    ("ebp",0);
@@ -165,7 +167,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
         &jnz    (&label("nohalt"));     # not enough privileges
 
         &pushf  ();
-        &pop    ("eax")
+        &pop    ("eax");
         &bt     ("eax",9);
         &jnc    (&label("nohalt"));     # interrupts are disabled
 
@@ -280,7 +282,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
 #       arguments is 1 or 2!
 &function_begin_B("OPENSSL_indirect_call");
         {
-        my $i,$max=7;           # $max has to be chosen as 4*n-1
+        my ($max,$i)=(7,);      # $max has to be chosen as 4*n-1
                                 # in order to preserve eventual
                                 # stack alignment
         &push   ("ebp");