From: | "Patrick Lauer (patrick)" <patrick@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-libs/crypto++/files: crypto++-5.6.1-rijndael.patch |
Date: | Wed, 28 Dec 2011 07:02:13 |
Message-Id: | 20111228070202.DA07F2004B@flycatcher.gentoo.org |
1 | patrick 11/12/28 07:02:02 |
2 | |
3 | Added: crypto++-5.6.1-rijndael.patch |
4 | Log: |
5 | Fixing #322713 again, this time with upstream patch |
6 | |
7 | (Portage version: 2.2.0_alpha81/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/crypto++/files/crypto++-5.6.1-rijndael.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: crypto++-5.6.1-rijndael.patch |
16 | =================================================================== |
17 | --- rijndael.cpp 2010-08-06 18:46:22.000000000 +0200 |
18 | +++ rijndael.cpp2 2011-12-27 16:10:52.606933355 +0100 |
19 | @@ -349,7 +349,11 @@ |
20 | void Rijndael::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const |
21 | { |
22 | #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE |
23 | +#if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) |
24 | if (HasSSE2()) |
25 | +#else |
26 | + if (HasAESNI()) |
27 | +#endif |
28 | { |
29 | Rijndael::Enc::AdvancedProcessBlocks(inBlock, xorBlock, outBlock, 16, 0); |
30 | return; |