Downsync from HEAD.
PR: 1059
This commit is contained in:
		@@ -1024,11 +1024,11 @@ AES_cbc_encrypt:
 | 
			
		||||
.L005pic_point:
 | 
			
		||||
	popl	%ebp
 | 
			
		||||
	pushfl
 | 
			
		||||
	cld	
 | 
			
		||||
	cld
 | 
			
		||||
	cmpl	$0,		44(%esp)
 | 
			
		||||
	je	.L006DECRYPT
 | 
			
		||||
	leal	AES_Te-.L005pic_point(%ebp),%ebp
 | 
			
		||||
	leal	-324(%esp),	%edi
 | 
			
		||||
	leal	-308(%esp),	%edi
 | 
			
		||||
	andl	$-64,		%edi
 | 
			
		||||
	movl	%ebp,		%eax
 | 
			
		||||
	leal	2048(%ebp),	%ebx
 | 
			
		||||
@@ -1044,7 +1044,7 @@ AES_cbc_encrypt:
 | 
			
		||||
.L007te_break_out:
 | 
			
		||||
	subl	%eax,		%edx
 | 
			
		||||
	andl	$4095,		%edx
 | 
			
		||||
	addl	$384,		%edx
 | 
			
		||||
	addl	$320,		%edx
 | 
			
		||||
	subl	%edx,		%edi
 | 
			
		||||
.align	4
 | 
			
		||||
.L008te_ok:
 | 
			
		||||
@@ -1060,7 +1060,7 @@ AES_cbc_encrypt:
 | 
			
		||||
	movl	%ecx,		28(%esp)
 | 
			
		||||
	movl	%edx,		32(%esp)
 | 
			
		||||
	movl	%esi,		36(%esp)
 | 
			
		||||
	movl	$65,		%ecx
 | 
			
		||||
	movl	$61,		%ecx
 | 
			
		||||
	movl	%edx,		%esi
 | 
			
		||||
	leal	60(%esp),	%edi
 | 
			
		||||
	movl	%edi,		32(%esp)
 | 
			
		||||
@@ -1120,7 +1120,7 @@ AES_cbc_encrypt:
 | 
			
		||||
	movl	%edx,		12(%esi)
 | 
			
		||||
	movl	32(%esp),	%edi
 | 
			
		||||
	movl	16(%esp),	%esp
 | 
			
		||||
	movl	$64,		%ecx
 | 
			
		||||
	movl	$60,		%ecx
 | 
			
		||||
	xorl	%eax,		%eax
 | 
			
		||||
.align	4
 | 
			
		||||
	.long	4136217587
 | 
			
		||||
@@ -1159,7 +1159,7 @@ AES_cbc_encrypt:
 | 
			
		||||
.align	4
 | 
			
		||||
.L006DECRYPT:
 | 
			
		||||
	leal	AES_Td-.L005pic_point(%ebp),%ebp
 | 
			
		||||
	leal	-324(%esp),	%edi
 | 
			
		||||
	leal	-308(%esp),	%edi
 | 
			
		||||
	andl	$-64,		%edi
 | 
			
		||||
	movl	%ebp,		%eax
 | 
			
		||||
	leal	3072(%ebp),	%ebx
 | 
			
		||||
@@ -1175,7 +1175,7 @@ AES_cbc_encrypt:
 | 
			
		||||
.L014td_break_out:
 | 
			
		||||
	subl	%eax,		%edx
 | 
			
		||||
	andl	$4095,		%edx
 | 
			
		||||
	addl	$384,		%edx
 | 
			
		||||
	addl	$320,		%edx
 | 
			
		||||
	subl	%edx,		%edi
 | 
			
		||||
.align	4
 | 
			
		||||
.L015td_ok:
 | 
			
		||||
@@ -1191,7 +1191,7 @@ AES_cbc_encrypt:
 | 
			
		||||
	movl	%ecx,		28(%esp)
 | 
			
		||||
	movl	%edx,		32(%esp)
 | 
			
		||||
	movl	%esi,		36(%esp)
 | 
			
		||||
	movl	$65,		%ecx
 | 
			
		||||
	movl	$61,		%ecx
 | 
			
		||||
	movl	%edx,		%esi
 | 
			
		||||
	leal	60(%esp),	%edi
 | 
			
		||||
	movl	%edi,		32(%esp)
 | 
			
		||||
@@ -1323,7 +1323,7 @@ AES_cbc_encrypt:
 | 
			
		||||
.L021dec_out:
 | 
			
		||||
	movl	32(%esp),	%edi
 | 
			
		||||
	movl	16(%esp),	%esp
 | 
			
		||||
	movl	$64,		%ecx
 | 
			
		||||
	movl	$60,		%ecx
 | 
			
		||||
	xorl	%eax,		%eax
 | 
			
		||||
.align	4
 | 
			
		||||
	.long	4136217587
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@ const char * const FIPS_source_hashes[] = {
 | 
			
		||||
"HMAC-SHA1(fips.h)= 564e34c12d6743a9be06d5da74608a71937c872a",
 | 
			
		||||
"HMAC-SHA1(fips_err.h)= 32ad0130f639b8f6ff417d3dfda553f5a1d7512d",
 | 
			
		||||
"HMAC-SHA1(aes/fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55",
 | 
			
		||||
"HMAC-SHA1(aes/asm/fips-ax86-elf.s)= 00d01a2e76509350ede25d0e3bde763136a6b679",
 | 
			
		||||
"HMAC-SHA1(aes/asm/fips-ax86-elf.s)= 361df58c4838e55cf0b5fa1427c81c253e551388",
 | 
			
		||||
"HMAC-SHA1(aes/fips_aes_selftest.c)= 98b01502221e7fe529fd981222f2cbb52eb4cbe0",
 | 
			
		||||
"HMAC-SHA1(aes/fips_aes_locl.h)= a98eb0aa449f1d95b8064e261b2ac2b1f328685e",
 | 
			
		||||
"HMAC-SHA1(des/fips_des_enc.c)= 9527f8ea81602358f1aa11348237fdb1e9eeff32",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user