Skip to content

Commit 0157bef

Browse files
karel-mkarel-m
authored
Merge pull request #442 from libtom/pr/ltc-byte
Rename macro 'byte' to 'LTC_BYTE'
2 parents c5e4679 + bb5ea12 commit 0157bef

File tree

9 files changed

+199
-200
lines changed

9 files changed

+199
-200
lines changed

‎src/ciphers/aes/aes.c‎

Lines changed: 152 additions & 152 deletions
Large diffs are not rendered by default.

‎src/ciphers/blowfish.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,9 @@ int blowfish_setup(const unsigned char *key, int keylen, int num_rounds,
373373
}
374374

375375
#ifndef __GNUC__
376-
#define F(x) ((S1[byte(x,3)] + S2[byte(x,2)]) ^ S3[byte(x,1)]) + S4[byte(x,0)]
376+
#define F(x) ((S1[LTC_BYTE(x,3)] + S2[LTC_BYTE(x,2)]) ^ S3[LTC_BYTE(x,1)]) + S4[LTC_BYTE(x,0)]
377377
#else
378-
#define F(x) ((skey->blowfish.S[0][byte(x,3)] + skey->blowfish.S[1][byte(x,2)]) ^ skey->blowfish.S[2][byte(x,1)]) + skey->blowfish.S[3][byte(x,0)]
378+
#define F(x) ((skey->blowfish.S[0][LTC_BYTE(x,3)] + skey->blowfish.S[1][LTC_BYTE(x,2)]) ^ skey->blowfish.S[2][LTC_BYTE(x,1)]) + skey->blowfish.S[3][LTC_BYTE(x,0)]
379379
#endif
380380

381381
/**

‎src/ciphers/cast5.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,23 +508,23 @@ INLINE static ulong32 FI(ulong32 R, ulong32 Km, ulong32 Kr)
508508
ulong32 I;
509509
I = (Km + R);
510510
I = ROL(I, Kr);
511-
return ((S1[byte(I, 3)] ^ S2[byte(I,2)]) - S3[byte(I,1)]) + S4[byte(I,0)];
511+
return ((S1[LTC_BYTE(I, 3)] ^ S2[LTC_BYTE(I,2)]) - S3[LTC_BYTE(I,1)]) + S4[LTC_BYTE(I,0)];
512512
}
513513

514514
INLINE static ulong32 FII(ulong32 R, ulong32 Km, ulong32 Kr)
515515
{
516516
ulong32 I;
517517
I = (Km ^ R);
518518
I = ROL(I, Kr);
519-
return ((S1[byte(I, 3)] - S2[byte(I,2)]) + S3[byte(I,1)]) ^ S4[byte(I,0)];
519+
return ((S1[LTC_BYTE(I, 3)] - S2[LTC_BYTE(I,2)]) + S3[LTC_BYTE(I,1)]) ^ S4[LTC_BYTE(I,0)];
520520
}
521521

522522
INLINE static ulong32 FIII(ulong32 R, ulong32 Km, ulong32 Kr)
523523
{
524524
ulong32 I;
525525
I = (Km - R);
526526
I = ROL(I, Kr);
527-
return ((S1[byte(I, 3)] + S2[byte(I,2)]) ^ S3[byte(I,1)]) - S4[byte(I,0)];
527+
return ((S1[LTC_BYTE(I, 3)] + S2[LTC_BYTE(I,2)]) ^ S3[LTC_BYTE(I,1)]) - S4[LTC_BYTE(I,0)];
528528
}
529529

530530
/**

‎src/ciphers/des.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,14 +1432,14 @@ static void _desfunc(ulong32 *block, const ulong32 *keys)
14321432
#else
14331433
{
14341434
ulong64 tmp;
1435-
tmp = des_ip[0][byte(leftt, 0)] ^
1436-
des_ip[1][byte(leftt, 1)] ^
1437-
des_ip[2][byte(leftt, 2)] ^
1438-
des_ip[3][byte(leftt, 3)] ^
1439-
des_ip[4][byte(right, 0)] ^
1440-
des_ip[5][byte(right, 1)] ^
1441-
des_ip[6][byte(right, 2)] ^
1442-
des_ip[7][byte(right, 3)];
1435+
tmp = des_ip[0][LTC_BYTE(leftt, 0)] ^
1436+
des_ip[1][LTC_BYTE(leftt, 1)] ^
1437+
des_ip[2][LTC_BYTE(leftt, 2)] ^
1438+
des_ip[3][LTC_BYTE(leftt, 3)] ^
1439+
des_ip[4][LTC_BYTE(right, 0)] ^
1440+
des_ip[5][LTC_BYTE(right, 1)] ^
1441+
des_ip[6][LTC_BYTE(right, 2)] ^
1442+
des_ip[7][LTC_BYTE(right, 3)];
14431443
leftt = (ulong32)(tmp >> 32);
14441444
right = (ulong32)(tmp & 0xFFFFFFFFUL);
14451445
}
@@ -1491,14 +1491,14 @@ static void _desfunc(ulong32 *block, const ulong32 *keys)
14911491
#else
14921492
{
14931493
ulong64 tmp;
1494-
tmp = des_fp[0][byte(leftt, 0)] ^
1495-
des_fp[1][byte(leftt, 1)] ^
1496-
des_fp[2][byte(leftt, 2)] ^
1497-
des_fp[3][byte(leftt, 3)] ^
1498-
des_fp[4][byte(right, 0)] ^
1499-
des_fp[5][byte(right, 1)] ^
1500-
des_fp[6][byte(right, 2)] ^
1501-
des_fp[7][byte(right, 3)];
1494+
tmp = des_fp[0][LTC_BYTE(leftt, 0)] ^
1495+
des_fp[1][LTC_BYTE(leftt, 1)] ^
1496+
des_fp[2][LTC_BYTE(leftt, 2)] ^
1497+
des_fp[3][LTC_BYTE(leftt, 3)] ^
1498+
des_fp[4][LTC_BYTE(right, 0)] ^
1499+
des_fp[5][LTC_BYTE(right, 1)] ^
1500+
des_fp[6][LTC_BYTE(right, 2)] ^
1501+
des_fp[7][LTC_BYTE(right, 3)];
15021502
leftt = (ulong32)(tmp >> 32);
15031503
right = (ulong32)(tmp & 0xFFFFFFFFUL);
15041504
}

‎src/ciphers/twofish/twofish.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ static void h_func(const unsigned char *in, unsigned char *out, const unsigned c
278278
#endif
279279

280280
/* the G function */
281-
#define g_func(x, dum) (S1[byte(x,0)] ^ S2[byte(x,1)] ^ S3[byte(x,2)] ^ S4[byte(x,3)])
282-
#define g1_func(x, dum) (S2[byte(x,0)] ^ S3[byte(x,1)] ^ S4[byte(x,2)] ^ S1[byte(x,3)])
281+
#define g_func(x, dum) (S1[LTC_BYTE(x,0)] ^ S2[LTC_BYTE(x,1)] ^ S3[LTC_BYTE(x,2)] ^ S4[LTC_BYTE(x,3)])
282+
#define g1_func(x, dum) (S2[LTC_BYTE(x,0)] ^ S3[LTC_BYTE(x,1)] ^ S4[LTC_BYTE(x,2)] ^ S1[LTC_BYTE(x,3)])
283283

284284
#else
285285

‎src/hashes/tiger.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,8 @@ INLINE static void tiger_round(ulong64 *a, ulong64 *b, ulong64 *c, ulong64 x, in
564564
{
565565
ulong64 tmp;
566566
tmp = (*c ^= x);
567-
*a -= t1[byte(tmp, 0)] ^ t2[byte(tmp, 2)] ^ t3[byte(tmp, 4)] ^ t4[byte(tmp, 6)];
568-
tmp = (*b += t4[byte(tmp, 1)] ^ t3[byte(tmp, 3)] ^ t2[byte(tmp,5)] ^ t1[byte(tmp,7)]);
567+
*a -= t1[LTC_BYTE(tmp, 0)] ^ t2[LTC_BYTE(tmp, 2)] ^ t3[LTC_BYTE(tmp, 4)] ^ t4[LTC_BYTE(tmp, 6)];
568+
tmp = (*b += t4[LTC_BYTE(tmp, 1)] ^ t3[LTC_BYTE(tmp, 3)] ^ t2[LTC_BYTE(tmp,5)] ^ t1[LTC_BYTE(tmp,7)]);
569569
switch (mul) {
570570
case 5: *b = (tmp << 2) + tmp; break;
571571
case 7: *b = (tmp << 3) - tmp; break;

‎src/headers/tomcrypt_macros.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,6 @@ static inline ulong64 ROR64(ulong64 word, int i)
429429
#define LTC_UNUSED_PARAM(x) (void)(x)
430430
#endif
431431

432-
/* extract a byte portably */
433-
#ifdef _MSC_VER
434-
#define byte(x, n) ((unsigned char)((x) >> (8 * (n))))
435-
#else
436-
#define byte(x, n) (((x) >> (8 * (n))) & 255)
437-
#endif
438-
439432
/* there is no snprintf before Visual C++ 2015 */
440433
#if defined(_MSC_VER) && _MSC_VER < 1900
441434
#define snprintf _snprintf

‎src/headers/tomcrypt_private.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,12 @@ int which ## _export(unsigned char *out, unsigned long *outlen, prng_state *prng
340340
return CRYPT_OK; \
341341
}
342342

343+
/* extract a byte portably */
344+
#ifdef _MSC_VER
345+
#define LTC_BYTE(x, n) ((unsigned char)((x) >> (8 * (n))))
346+
#else
347+
#define LTC_BYTE(x, n) (((x) >> (8 * (n))) & 255)
348+
#endif
343349

344350
/* ref: $Format:%D$ */
345351
/* git commit: $Format:%H$ */

‎src/mac/pelican/pelican.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,25 +62,25 @@ static void _four_rounds(pelican_state *pelmac)
6262
LOAD32H(s3, pelmac->state + 12);
6363
for (r = 0; r < 4; r++) {
6464
t0 =
65-
Te0(byte(s0, 3)) ^
66-
Te1(byte(s1, 2)) ^
67-
Te2(byte(s2, 1)) ^
68-
Te3(byte(s3, 0));
65+
Te0(LTC_BYTE(s0, 3)) ^
66+
Te1(LTC_BYTE(s1, 2)) ^
67+
Te2(LTC_BYTE(s2, 1)) ^
68+
Te3(LTC_BYTE(s3, 0));
6969
t1 =
70-
Te0(byte(s1, 3)) ^
71-
Te1(byte(s2, 2)) ^
72-
Te2(byte(s3, 1)) ^
73-
Te3(byte(s0, 0));
70+
Te0(LTC_BYTE(s1, 3)) ^
71+
Te1(LTC_BYTE(s2, 2)) ^
72+
Te2(LTC_BYTE(s3, 1)) ^
73+
Te3(LTC_BYTE(s0, 0));
7474
t2 =
75-
Te0(byte(s2, 3)) ^
76-
Te1(byte(s3, 2)) ^
77-
Te2(byte(s0, 1)) ^
78-
Te3(byte(s1, 0));
75+
Te0(LTC_BYTE(s2, 3)) ^
76+
Te1(LTC_BYTE(s3, 2)) ^
77+
Te2(LTC_BYTE(s0, 1)) ^
78+
Te3(LTC_BYTE(s1, 0));
7979
t3 =
80-
Te0(byte(s3, 3)) ^
81-
Te1(byte(s0, 2)) ^
82-
Te2(byte(s1, 1)) ^
83-
Te3(byte(s2, 0));
80+
Te0(LTC_BYTE(s3, 3)) ^
81+
Te1(LTC_BYTE(s0, 2)) ^
82+
Te2(LTC_BYTE(s1, 1)) ^
83+
Te3(LTC_BYTE(s2, 0));
8484
s0 = t0; s1 = t1; s2 = t2; s3 = t3;
8585
}
8686
STORE32H(s0, pelmac->state );

0 commit comments

Comments
 (0)