Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

MacOSX: various changes for assembly files build. Don't use 32-bit assembly code of SHA-512 since it is not compatible with PIE configuration of OSX compiler (absolute addressing used)

Browse Source
This commit is contained in:
Mounir IDRASSI
2017-06-26 16:53:12 +02:00
parent e8bafa6a37
commit 3d8260d3d3
13 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Crypto/Sha2.c
View File

@@ -26,7 +26,7 @@ extern "C"
void sha512_avx(const void* M, void* D, uint_64t l);
#endif
#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
#if CRYPTOPP_BOOL_X64 || ((CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32) && !defined (TC_MACOSX))
void sha512_compress_nayuki(uint_64t state[8], const uint_8t block[128]);
#endif
#if defined(__cplusplus)
@@ -173,7 +173,7 @@ void SSE4Transform(sha512_ctx* ctx, void* mp, uint_64t num_blks)
}
#endif
#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
#if CRYPTOPP_BOOL_X64 || ((CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32) && !defined (TC_MACOSX))
void SSE2Transform(sha512_ctx* ctx, void* mp, uint_64t num_blks)
{
@@ -216,7 +216,7 @@ void sha512_begin(sha512_ctx* ctx)
else
#endif
#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
#if CRYPTOPP_BOOL_X64 || ((CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32) && !defined (TC_MACOSX))
if (HasSSE2() && HasMMX())
transfunc = SSE2Transform;
else