Commit 98909c1d authored by Andy Polyakov's avatar Andy Polyakov
Browse files

ghash-x86.pl: engage original MMX version in no-sse2 builds.

parent ccd395cb

crypto/modes/asm/ghash-x86.pl

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ if (!$x86only) {{{ 


&static_label("rem_4bit");



if (0) {{	# "May" MMX version is kept for reference...

if (!$sse2) {{	# pure-MMX "May" version...



$S=12;		# shift factor for rem_4bit

crypto/modes/gcm128.c

+4 −0
Original line number Diff line number Diff line
@@ -726,7 +726,11 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx,void *key,block128_f block) 
#  endif

	gcm_init_4bit(ctx->Htable,ctx->H.u);

#  if	defined(GHASH_ASM_X86)			/* x86 only */

#   if	defined(OPENSSL_IA32_SSE2)

	if (OPENSSL_ia32cap_P[0]&(1<<25)) {	/* check SSE bit */

#   else

	if (OPENSSL_ia32cap_P[0]&(1<<23)) {	/* check MMX bit */

#   endif

		ctx->gmult = gcm_gmult_4bit_mmx;

		ctx->ghash = gcm_ghash_4bit_mmx;

	} else {