Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cast STORE64H/STORE64L argument to ulong64 #537

Closed
wants to merge 1 commit into from
Closed

Cast STORE64H/STORE64L argument to ulong64 #537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 24 additions & 24 deletions src/headers/tomcrypt_macros.h
View file
Open in desktop
Expand Up @@ -21,10 +21,10 @@
((ulong32)((y)[0] & 255)); } while(0)

#define STORE64L(x, y) \
do { (y)[7] = (unsigned char)(((x)>>56)&255); (y)[6] = (unsigned char)(((x)>>48)&255); \
(y)[5] = (unsigned char)(((x)>>40)&255); (y)[4] = (unsigned char)(((x)>>32)&255); \
(y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255); \
(y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); } while(0)
do { (y)[7] = (unsigned char)(((ulong64)(x)>>56)&255); (y)[6] = (unsigned char)(((ulong64)(x)>>48)&255); \
(y)[5] = (unsigned char)(((ulong64)(x)>>40)&255); (y)[4] = (unsigned char)(((ulong64)(x)>>32)&255); \
(y)[3] = (unsigned char)(((ulong64)(x)>>24)&255); (y)[2] = (unsigned char)(((ulong64)(x)>>16)&255); \
(y)[1] = (unsigned char)(((ulong64)(x)>>8)&255); (y)[0] = (unsigned char)((ulong64)(x)&255); } while(0)

#define LOAD64L(x, y) \
do { x = (((ulong64)((y)[7] & 255))<<56)|(((ulong64)((y)[6] & 255))<<48)| \
Expand All @@ -43,10 +43,10 @@
((ulong32)((y)[3] & 255)); } while(0)

#define STORE64H(x, y) \
do { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255); \
(y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255); \
(y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255); \
(y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); } while(0)
do { (y)[0] = (unsigned char)(((ulong64)(x)>>56)&255); (y)[1] = (unsigned char)(((ulong64)(x)>>48)&255); \
(y)[2] = (unsigned char)(((ulong64)(x)>>40)&255); (y)[3] = (unsigned char)(((ulong64)(x)>>32)&255); \
(y)[4] = (unsigned char)(((ulong64)(x)>>24)&255); (y)[5] = (unsigned char)(((ulong64)(x)>>16)&255); \
(y)[6] = (unsigned char)(((ulong64)(x)>>8)&255); (y)[7] = (unsigned char)((ulong64)(x)&255); } while(0)

#define LOAD64H(x, y) \
do { x = (((ulong64)((y)[0] & 255))<<56)|(((ulong64)((y)[1] & 255))<<48) | \
Expand Down Expand Up @@ -125,10 +125,10 @@ asm __volatile__ ( \
#else

#define STORE64H(x, y) \
do { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255); \
(y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255); \
(y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255); \
(y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); } while(0)
do { (y)[0] = (unsigned char)(((ulong64)(x)>>56)&255); (y)[1] = (unsigned char)(((ulong64)(x)>>48)&255); \
(y)[2] = (unsigned char)(((ulong64)(x)>>40)&255); (y)[3] = (unsigned char)(((ulong64)(x)>>32)&255); \
(y)[4] = (unsigned char)(((ulong64)(x)>>24)&255); (y)[5] = (unsigned char)(((ulong64)(x)>>16)&255); \
(y)[6] = (unsigned char)(((ulong64)(x)>>8)&255); (y)[7] = (unsigned char)((ulong64)(x)&255); } while(0)

#define LOAD64H(x, y) \
do { x = (((ulong64)((y)[0] & 255))<<56)|(((ulong64)((y)[1] & 255))<<48) | \
Expand All @@ -147,10 +147,10 @@ do { x = (((ulong64)((y)[0] & 255))<<56)|(((ulong64)((y)[1] & 255))<<48) | \
do { XMEMCPY(&(x), y, 4); } while(0)

#define STORE64L(x, y) \
do { (y)[7] = (unsigned char)(((x)>>56)&255); (y)[6] = (unsigned char)(((x)>>48)&255); \
(y)[5] = (unsigned char)(((x)>>40)&255); (y)[4] = (unsigned char)(((x)>>32)&255); \
(y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255); \
(y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); } while(0)
do { (y)[7] = (unsigned char)(((ulong64)(x))>>56)&255); (y)[6] = (unsigned char)((((ulong64)(x))>>48)&255); \
(y)[5] = (unsigned char)(((ulong64)(x))>>40)&255); (y)[4] = (unsigned char)((((ulong64)(x))>>32)&255); \
(y)[3] = (unsigned char)(((ulong64)(x))>>24)&255); (y)[2] = (unsigned char)((((ulong64)(x))>>16)&255); \
(y)[1] = (unsigned char)(((ulong64)(x))>>8)&255); (y)[0] = (unsigned char)(((ulong64)(x))&255); } while(0)

#define LOAD64L(x, y) \
do { x = (((ulong64)((y)[7] & 255))<<56)|(((ulong64)((y)[6] & 255))<<48)| \
Expand Down Expand Up @@ -187,10 +187,10 @@ do { x = (((ulong64)((y)[0] & 255))<<56)|(((ulong64)((y)[1] & 255))<<48) | \
((ulong32)((y)[0] & 255)); } while(0)

#define STORE64L(x, y) \
do { (y)[7] = (unsigned char)(((x)>>56)&255); (y)[6] = (unsigned char)(((x)>>48)&255); \
(y)[5] = (unsigned char)(((x)>>40)&255); (y)[4] = (unsigned char)(((x)>>32)&255); \
(y)[3] = (unsigned char)(((x)>>24)&255); (y)[2] = (unsigned char)(((x)>>16)&255); \
(y)[1] = (unsigned char)(((x)>>8)&255); (y)[0] = (unsigned char)((x)&255); } while(0)
do { (y)[7] = (unsigned char)((((ulong64)(x))>>56)&255); (y)[6] = (unsigned char)((((ulong64)(x))>>48)&255); \
(y)[5] = (unsigned char)((((ulong64)(x))>>40)&255); (y)[4] = (unsigned char)((((ulong64)(x))>>32)&255); \
(y)[3] = (unsigned char)((((ulong64)(x))>>24)&255); (y)[2] = (unsigned char)((((ulong64)(x))>>16)&255); \
(y)[1] = (unsigned char)((((ulong64)(x))>>8)&255); (y)[0] = (unsigned char)(((ulong64)(x))&255); } while(0)

#define LOAD64L(x, y) \
do { x = (((ulong64)((y)[7] & 255))<<56)|(((ulong64)((y)[6] & 255))<<48) | \
Expand All @@ -207,10 +207,10 @@ do { x = (((ulong64)((y)[7] & 255))<<56)|(((ulong64)((y)[6] & 255))<<48) | \
do { XMEMCPY(&(x), y, 4); } while(0)

#define STORE64H(x, y) \
do { (y)[0] = (unsigned char)(((x)>>56)&255); (y)[1] = (unsigned char)(((x)>>48)&255); \
(y)[2] = (unsigned char)(((x)>>40)&255); (y)[3] = (unsigned char)(((x)>>32)&255); \
(y)[4] = (unsigned char)(((x)>>24)&255); (y)[5] = (unsigned char)(((x)>>16)&255); \
(y)[6] = (unsigned char)(((x)>>8)&255); (y)[7] = (unsigned char)((x)&255); } while(0)
do { (y)[0] = (unsigned char)(((ulong64)(x)>>56)&255); (y)[1] = (unsigned char)(((ulong64)(x)>>48)&255); \
(y)[2] = (unsigned char)(((ulong64)(x)>>40)&255); (y)[3] = (unsigned char)(((ulong64)(x)>>32)&255); \
(y)[4] = (unsigned char)(((ulong64)(x)>>24)&255); (y)[5] = (unsigned char)(((ulong64)(x)>>16)&255); \
(y)[6] = (unsigned char)(((ulong64)(x)>>8)&255); (y)[7] = (unsigned char)((ulong64)(x)&255); } while(0)

#define LOAD64H(x, y) \
do { x = (((ulong64)((y)[0] & 255))<<56)|(((ulong64)((y)[1] & 255))<<48)| \
Expand Down