1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00

Update to 5.6.1.

Submitted by:	Michael Richards <hackish gmail.com>
Feature safe:	yes
This commit is contained in:
Xin LI 2011-01-22 23:21:52 +00:00
parent 2e9c2dd2ef
commit fdf1d0d2a4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=268122
3 changed files with 3 additions and 45 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= cryptopp
PORTVERSION= 5.6.0
PORTREVISION= 1
PORTVERSION= 5.6.1
CATEGORIES= security
MASTER_SITES= SF \
http://www.cryptopp.com/

View File

@ -1,3 +1,2 @@
MD5 (cryptopp560.zip) = 36f35789ad60489d58003d3c849807e8
SHA256 (cryptopp560.zip) = b522f0b5f850b50e9917823ea986f855295407380fafbe30f358875c41998bc5
SIZE (cryptopp560.zip) = 1049029
SHA256 (cryptopp561.zip) = 98e74d8cb17a38033354519ac8ba9c5d98a6dc00bf5d1ec3c533c2e8ec86f268
SIZE (cryptopp561.zip) = 1069703

View File

@ -1,40 +0,0 @@
--- ./sha.cpp.orig 2009-03-15 02:48:00.000000000 -0700
+++ ./sha.cpp 2010-01-29 18:49:49.247445242 -0800
@@ -273,14 +273,15 @@
#endif
AS2( mov STATE_SAVE, WORD_REG(cx))
AS2( mov DATA_SAVE, WORD_REG(dx))
- AS2( add WORD_REG(di), WORD_REG(dx))
- AS2( mov DATA_END, WORD_REG(di))
+ AS2( lea WORD_REG(ax), [WORD_REG(di) + WORD_REG(dx)])
+ AS2( mov DATA_END, WORD_REG(ax))
AS2( mov K_END, WORD_REG(si))
#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
#if CRYPTOPP_BOOL_X86
AS2( test edi, 1)
ASJ( jnz, 2, f)
+ AS1( dec DWORD PTR K_END)
#endif
AS2( movdqa xmm0, XMMWORD_PTR [WORD_REG(cx)+0*16])
AS2( movdqa xmm1, XMMWORD_PTR [WORD_REG(cx)+1*16])
@@ -355,7 +356,7 @@
ROUND(14, 1, eax, ecx, edi, edx)
ROUND(15, 1, ecx, eax, edx, edi)
AS2( cmp WORD_REG(si), K_END)
- ASJ( jne, 1, b)
+ ASJ( jl, 1, b)
AS2( mov WORD_REG(dx), DATA_SAVE)
AS2( add WORD_REG(dx), 64)
@@ -364,8 +365,8 @@
#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
#if CRYPTOPP_BOOL_X86
- AS2( test DWORD PTR DATA_END, 1)
- ASJ( jnz, 4, f)
+ AS2( test DWORD PTR K_END, 1)
+ ASJ( jz, 4, f)
#endif
AS2( movdqa xmm1, XMMWORD_PTR [AS_REG_7+1*16])
AS2( movdqa xmm0, XMMWORD_PTR [AS_REG_7+0*16])