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

Crypto: make Serpent source code use the same rotl32/rotr32 primitives as the other files.

Browse Source
This commit is contained in:
Mounir IDRASSI
2016-06-05 13:52:25 +02:00
parent d4e95293d9
commit 21d567f731
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/Crypto/Serpent.c
View File

@@ -10,37 +10,37 @@
#include "Serpent.h" #include "Serpent.h"
#include "Common/Endian.h" #include "Common/Endian.h"
#include <memory.h> #ifdef TC_WINDOWS_BOOT
#if defined(_WIN32) && !defined(_DEBUG)
#include <stdlib.h> #include <stdlib.h>
#define rotlFixed _rotl #pragma intrinsic(_lrotr,_lrotl)
#define rotrFixed _rotr #define rotr32(x,n) _lrotr(x, n)
#define rotl32(x,n) _lrotl(x, n)
#else #else
#define rotlFixed(x,n) (((x) << (n)) | ((x) >> (32 - (n)))) #include "Crypto/misc.h"
#define rotrFixed(x,n) (((x) >> (n)) | ((x) << (32 - (n))))
#endif #endif
#include <memory.h>
// linear transformation // linear transformation
#define LT(i,a,b,c,d,e) {\ #define LT(i,a,b,c,d,e) {\
a = rotlFixed(a, 13); \ a = rotl32(a, 13); \
c = rotlFixed(c, 3); \ c = rotl32(c, 3); \
d = rotlFixed(d ^ c ^ (a << 3), 7); \ d = rotl32(d ^ c ^ (a << 3), 7); \
b = rotlFixed(b ^ a ^ c, 1); \ b = rotl32(b ^ a ^ c, 1); \
a = rotlFixed(a ^ b ^ d, 5); \ a = rotl32(a ^ b ^ d, 5); \
c = rotlFixed(c ^ d ^ (b << 7), 22);} c = rotl32(c ^ d ^ (b << 7), 22);}
// inverse linear transformation // inverse linear transformation
#define ILT(i,a,b,c,d,e) {\ #define ILT(i,a,b,c,d,e) {\
c = rotrFixed(c, 22); \ c = rotr32(c, 22); \
a = rotrFixed(a, 5); \ a = rotr32(a, 5); \
c ^= d ^ (b << 7); \ c ^= d ^ (b << 7); \
a ^= b ^ d; \ a ^= b ^ d; \
b = rotrFixed(b, 1); \ b = rotr32(b, 1); \
d = rotrFixed(d, 7) ^ c ^ (a << 3); \ d = rotr32(d, 7) ^ c ^ (a << 3); \
b ^= a ^ c; \ b ^= a ^ c; \
c = rotrFixed(c, 3); \ c = rotr32(c, 3); \
a = rotrFixed(a, 13);} a = rotr32(a, 13);}
// order of output from S-box functions // order of output from S-box functions
#define beforeS0(f) f(0,a,b,c,d,e) #define beforeS0(f) f(0,a,b,c,d,e)
@@ -644,7 +644,7 @@ void serpent_set_key(const unsigned __int8 userKey[],unsigned __int8 *ks)
k += 8; k += 8;
t = k[-1]; t = k[-1];
for (i = 0; i < 132; ++i) for (i = 0; i < 132; ++i)
k[i] = t = rotlFixed(k[i-8] ^ k[i-5] ^ k[i-3] ^ t ^ 0x9e3779b9 ^ i, 11); k[i] = t = rotl32(k[i-8] ^ k[i-5] ^ k[i-3] ^ t ^ 0x9e3779b9 ^ i, 11);
k -= 20; k -= 20;
#define LK(r, a, b, c, d, e) {\ #define LK(r, a, b, c, d, e) {\
@@ -705,7 +705,7 @@ void serpent_set_key(const unsigned __int8 userKey[], unsigned __int8 *ks)
k += 8; k += 8;
t = k[-1]; t = k[-1];
for (i = 0; i < 132; ++i) for (i = 0; i < 132; ++i)
k[i] = t = rotlFixed(k[i-8] ^ k[i-5] ^ k[i-3] ^ t ^ 0x9e3779b9 ^ i, 11); k[i] = t = rotl32(k[i-8] ^ k[i-5] ^ k[i-3] ^ t ^ 0x9e3779b9 ^ i, 11);
k -= 20; k -= 20;
for (i=0; i<4; i++) for (i=0; i<4; i++)
@@ -780,12 +780,12 @@ typedef unsigned __int32 uint32;
static void LTf (uint32 *a, uint32 *b, uint32 *c, uint32 *d) static void LTf (uint32 *a, uint32 *b, uint32 *c, uint32 *d)
{ {
*a = rotlFixed(*a, 13); *a = rotl32(*a, 13);
*c = rotlFixed(*c, 3); *c = rotl32(*c, 3);
*d = rotlFixed(*d ^ *c ^ (*a << 3), 7); *d = rotl32(*d ^ *c ^ (*a << 3), 7);
*b = rotlFixed(*b ^ *a ^ *c, 1); *b = rotl32(*b ^ *a ^ *c, 1);
*a = rotlFixed(*a ^ *b ^ *d, 5); *a = rotl32(*a ^ *b ^ *d, 5);
*c = rotlFixed(*c ^ *d ^ (*b << 7), 22); *c = rotl32(*c ^ *d ^ (*b << 7), 22);
} }
void serpent_encrypt(const unsigned __int8 *inBlock, unsigned __int8 *outBlock, unsigned __int8 *ks) void serpent_encrypt(const unsigned __int8 *inBlock, unsigned __int8 *outBlock, unsigned __int8 *ks)
@@ -883,15 +883,15 @@ start:
static void ILTf (uint32 *a, uint32 *b, uint32 *c, uint32 *d) static void ILTf (uint32 *a, uint32 *b, uint32 *c, uint32 *d)
{ {
*c = rotrFixed(*c, 22); *c = rotr32(*c, 22);
*a = rotrFixed(*a, 5); *a = rotr32(*a, 5);
*c ^= *d ^ (*b << 7); *c ^= *d ^ (*b << 7);
*a ^= *b ^ *d; *a ^= *b ^ *d;
*b = rotrFixed(*b, 1); *b = rotr32(*b, 1);
*d = rotrFixed(*d, 7) ^ *c ^ (*a << 3); *d = rotr32(*d, 7) ^ *c ^ (*a << 3);
*b ^= *a ^ *c; *b ^= *a ^ *c;
*c = rotrFixed(*c, 3); *c = rotr32(*c, 3);
*a = rotrFixed(*a, 13); *a = rotr32(*a, 13);
} }
void serpent_decrypt(const unsigned __int8 *inBlock, unsigned __int8 *outBlock, unsigned __int8 *ks) void serpent_decrypt(const unsigned __int8 *inBlock, unsigned __int8 *outBlock, unsigned __int8 *ks)