Commit 8d1b199d authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Revert random changes from commit#22606.

parent 71fa4513

crypto/evp/e_rc4_hmac_md5.c

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx, 
#if	!defined(OPENSSL_NO_ASM) &&	( \

	defined(__x86_64)	|| defined(__x86_64__)	|| \

	defined(_M_AMD64)	|| defined(_M_X64)	|| \

	defined(__INTEL__)		) && \

	!(defined(__APPLE__) && defined(__MACH__))

	defined(__INTEL__)		)

#define	STITCHED_CALL

#endif

crypto/modes/gcm128.c

+1 −1
Original line number Diff line number Diff line
@@ -1752,7 +1752,7 @@ int main() 


	GHASH((&ctx),buf.c,sizeof(buf));

	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;

	printf("%.2f\n",gcm_t/(double)sizeof(buf)/(double)i);

	}

crypto/x86cpuid.pl

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } 


&function_begin_B("OPENSSL_far_spin");

	&pushf	();

	&pop	("eax")

	&pop	("eax");

	&bt	("eax",9);

	&jnc	(&label("nospin"));	# interrupts are disabled