generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert random changes from commit#22606.

Browse Source
This commit is contained in:
Andy Polyakov 2012-06-04 22:12:10 +00:00
parent 71fa451343
commit 8d1b199d26
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/evp/e_rc4_hmac_md5.c
View File

@ -103,8 +103,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
#if !defined(OPENSSL_NO_ASM) && ( \ #if !defined(OPENSSL_NO_ASM) && ( \
defined(__x86_64) || defined(__x86_64__) || \ defined(__x86_64) || defined(__x86_64__) || \
defined(_M_AMD64) || defined(_M_X64) || \ defined(_M_AMD64) || defined(_M_X64) || \
defined(__INTEL__) ) && \ defined(__INTEL__) )
!(defined(__APPLE__) && defined(__MACH__))
#define STITCHED_CALL #define STITCHED_CALL
#endif #endif

2
crypto/modes/gcm128.c
View File

@ -1752,7 +1752,7 @@ int main()
GHASH((&ctx),buf.c,sizeof(buf)); GHASH((&ctx),buf.c,sizeof(buf));
start = OPENSSL_rdtsc(); start = OPENSSL_rdtsc();
for (i=0;i<100;++i) GHASH(&ctx,buf.c,sizeof(buf)); for (i=0;i<100;++i) GHASH((&ctx),buf.c,sizeof(buf));
gcm_t = OPENSSL_rdtsc() - start; gcm_t = OPENSSL_rdtsc() - start;
printf("%.2f\n",gcm_t/(double)sizeof(buf)/(double)i); printf("%.2f\n",gcm_t/(double)sizeof(buf)/(double)i);
} }

2
crypto/x86cpuid.pl
View File

@ -196,7 +196,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
&function_begin_B("OPENSSL_far_spin"); &function_begin_B("OPENSSL_far_spin");
&pushf (); &pushf ();
&pop ("eax") &pop ("eax");
&bt ("eax",9); &bt ("eax",9);
&jnc (&label("nospin")); # interrupts are disabled &jnc (&label("nospin")); # interrupts are disabled