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

MacOSX: fix compiler warning about ALIGN macro being already defined

Browse Source
This commit is contained in:
Mounir IDRASSI
2016-08-17 19:23:04 +02:00
parent 0dc3cb7cd1
commit c6d5b30704
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Crypto/Streebog.c
View File

@@ -17,19 +17,19 @@
/* /*
* Iteration constants defined in standard. * Iteration constants defined in standard.
*/ */
ALIGN(16) static const unsigned long long buffer0[8] = { 0x0ULL, 0x0ULL, 0x0ULL, STREEBOG_ALIGN(16) static const unsigned long long buffer0[8] = { 0x0ULL, 0x0ULL, 0x0ULL,
0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL }; 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL };
#ifndef __GOST3411_BIG_ENDIAN__ #ifndef __GOST3411_BIG_ENDIAN__
ALIGN(16) static const unsigned long long buffer512[8] = {0x0000000000000200ULL, STREEBOG_ALIGN(16) static const unsigned long long buffer512[8] = {0x0000000000000200ULL,
0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL }; 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL };
#else #else
ALIGN(16) static const unsigned long long buffer512[8] = {{ 0x0002000000000000ULL, STREEBOG_ALIGN(16) static const unsigned long long buffer512[8] = {{ 0x0002000000000000ULL,
0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL }}; 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL, 0x0ULL }};
#endif #endif
#ifndef __GOST3411_BIG_ENDIAN__ #ifndef __GOST3411_BIG_ENDIAN__
ALIGN(16) static const unsigned long long C[12][8] = { STREEBOG_ALIGN(16) static const unsigned long long C[12][8] = {
{ {
0xdd806559f2a64507ULL, 0xdd806559f2a64507ULL,
0x05767436cc744d23ULL, 0x05767436cc744d23ULL,
@@ -152,7 +152,7 @@ ALIGN(16) static const unsigned long long C[12][8] = {
} }
}; };
#else #else
ALIGN(16) static const unsigned long long C[12][8] = { STREEBOG_ALIGN(16) static const unsigned long long C[12][8] = {
{ {
0x0745a6f2596580ddULL, 0x0745a6f2596580ddULL,
0x234d74cc36747605ULL, 0x234d74cc36747605ULL,
@@ -380,7 +380,7 @@ static const unsigned char Pi[256] = {
/* /*
* Precalculation of matrix A multiplication. * Precalculation of matrix A multiplication.
*/ */
ALIGN(16) static const unsigned long long Ax[8][256] = STREEBOG_ALIGN(16) static const unsigned long long Ax[8][256] =
{ {
{ {
0xd01f715b5c7ef8e6ULL, 0x16fa240980778325ULL, 0xa8a42e857ee049c8ULL, 0xd01f715b5c7ef8e6ULL, 0x16fa240980778325ULL, 0xa8a42e857ee049c8ULL,
@@ -1088,7 +1088,7 @@ ALIGN(16) static const unsigned long long Ax[8][256] =
} }
}; };
#else #else
ALIGN(16) static const unsigned long long Ax[8][256] = STREEBOG_ALIGN(16) static const unsigned long long Ax[8][256] =
{ {
{ {
0xe6f87e5c5b711fd0ULL, 0x258377800924fa16ULL, 0xc849e07e852ea4a8ULL, 0xe6f87e5c5b711fd0ULL, 0x258377800924fa16ULL, 0xc849e07e852ea4a8ULL,
@@ -2287,7 +2287,7 @@ g(unsigned long long *h, const unsigned long long *N, const unsigned char *m)
} else } else
#endif #endif
{ {
ALIGN(16) unsigned long long Ki[8], data[8]; STREEBOG_ALIGN(16) unsigned long long Ki[8], data[8];
unsigned int i; unsigned int i;
XLPS(h, N, (data)); XLPS(h, N, (data));
@@ -2322,7 +2322,7 @@ stage2(STREEBOG_CTX *CTX, const unsigned char *data)
static void static void
stage3(STREEBOG_CTX *CTX) stage3(STREEBOG_CTX *CTX)
{ {
ALIGN(16) unsigned long long buf[8]; STREEBOG_ALIGN(16) unsigned long long buf[8];
memset(buf, 0x00, sizeof buf); memset(buf, 0x00, sizeof buf);
memcpy(buf, (CTX->buffer), CTX->bufsize); memcpy(buf, (CTX->buffer), CTX->bufsize);

14
src/Crypto/Streebog.h
View File

@@ -16,15 +16,15 @@
extern "C" { extern "C" {
#endif #endif
#define ALIGN(a) CRYPTOPP_ALIGN_DATA(a) #define STREEBOG_ALIGN(a) CRYPTOPP_ALIGN_DATA(a)
typedef ALIGN(16) struct _STREEBOG_CTX typedef STREEBOG_ALIGN(16) struct _STREEBOG_CTX
{ {
ALIGN(16) unsigned char buffer[64]; STREEBOG_ALIGN(16) unsigned char buffer[64];
ALIGN(16) unsigned long long hash[8]; STREEBOG_ALIGN(16) unsigned long long hash[8];
ALIGN(16) unsigned long long h[8]; STREEBOG_ALIGN(16) unsigned long long h[8];
ALIGN(16) unsigned long long N[8]; STREEBOG_ALIGN(16) unsigned long long N[8];
ALIGN(16) unsigned long long Sigma[8]; STREEBOG_ALIGN(16) unsigned long long Sigma[8];
size_t bufsize; size_t bufsize;
unsigned int digest_size; unsigned int digest_size;
} STREEBOG_CTX; } STREEBOG_CTX;