void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 13:03:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Formatting and boring stuff

Browse source
This commit is contained in:
Adam Ierymenko 2020-06-05 10:41:32 -07:00
parent 9babfcb9b6
commit 45b90a0dfa
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 110 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
node/AES.cpp
View file

@ -1046,16 +1046,17 @@ void AES::_initSW(const uint8_t key[32]) noexcept
void AES::_encryptSW(const uint8_t in[16], uint8_t out[16]) const noexcept void AES::_encryptSW(const uint8_t in[16], uint8_t out[16]) const noexcept
{ {
const uint32_t *const rk = _k.sw.ek; const uint32_t *const restrict rk = _k.sw.ek;
const uint32_t m8 = 0xff; const uint32_t m8 = 0xff;
uint32_t s0 = readuint32_t(in) ^ rk[0]; uint32_t s0, s1, s2, s3, t0, t1, t2, t3;
uint32_t s1 = readuint32_t(in + 4) ^ rk[1]; s0 = readuint32_t(in) ^ rk[0];
uint32_t s2 = readuint32_t(in + 8) ^ rk[2]; s1 = readuint32_t(in + 4) ^ rk[1];
uint32_t s3 = readuint32_t(in + 12) ^ rk[3]; s2 = readuint32_t(in + 8) ^ rk[2];
uint32_t t0 = Te0[s0 >> 24U] ^Te1[(s1 >> 16U) & m8] ^Te2[(s2 >> 8U) & m8] ^Te3[s3 & m8] ^ rk[4]; s3 = readuint32_t(in + 12) ^ rk[3];
uint32_t t1 = Te0[s1 >> 24U] ^Te1[(s2 >> 16U) & m8] ^Te2[(s3 >> 8U) & m8] ^Te3[s0 & m8] ^ rk[5]; t0 = Te0[s0 >> 24U] ^ Te1[(s1 >> 16U) & m8] ^ Te2[(s2 >> 8U) & m8] ^ Te3[s3 & m8] ^ rk[4];
uint32_t t2 = Te0[s2 >> 24U] ^Te1[(s3 >> 16U) & m8] ^Te2[(s0 >> 8U) & m8] ^Te3[s1 & m8] ^ rk[6]; t1 = Te0[s1 >> 24U] ^ Te1[(s2 >> 16U) & m8] ^ Te2[(s3 >> 8U) & m8] ^ Te3[s0 & m8] ^ rk[5];
uint32_t t3 = Te0[s3 >> 24U] ^Te1[(s0 >> 16U) & m8] ^Te2[(s1 >> 8U) & m8] ^Te3[s2 & m8] ^ rk[7]; t2 = Te0[s2 >> 24U] ^ Te1[(s3 >> 16U) & m8] ^ Te2[(s0 >> 8U) & m8] ^ Te3[s1 & m8] ^ rk[6];
t3 = Te0[s3 >> 24U] ^ Te1[(s0 >> 16U) & m8] ^ Te2[(s1 >> 8U) & m8] ^ Te3[s2 & m8] ^ rk[7];
s0 = Te0[t0 >> 24U] ^ Te1[(t1 >> 16U) & m8] ^ Te2[(t2 >> 8U) & m8] ^ Te3[t3 & m8] ^ rk[8]; s0 = Te0[t0 >> 24U] ^ Te1[(t1 >> 16U) & m8] ^ Te2[(t2 >> 8U) & m8] ^ Te3[t3 & m8] ^ rk[8];
s1 = Te0[t1 >> 24U] ^ Te1[(t2 >> 16U) & m8] ^ Te2[(t3 >> 8U) & m8] ^ Te3[t0 & m8] ^ rk[9]; s1 = Te0[t1 >> 24U] ^ Te1[(t2 >> 16U) & m8] ^ Te2[(t3 >> 8U) & m8] ^ Te3[t0 & m8] ^ rk[9];
s2 = Te0[t2 >> 24U] ^ Te1[(t3 >> 16U) & m8] ^ Te2[(t0 >> 8U) & m8] ^ Te3[t1 & m8] ^ rk[10]; s2 = Te0[t2 >> 24U] ^ Te1[(t3 >> 16U) & m8] ^ Te2[(t0 >> 8U) & m8] ^ Te3[t1 & m8] ^ rk[10];
@ -1115,7 +1116,7 @@ void AES::_encryptSW(const uint8_t in[16], uint8_t out[16]) const noexcept
void AES::_decryptSW(const uint8_t in[16], uint8_t out[16]) const noexcept void AES::_decryptSW(const uint8_t in[16], uint8_t out[16]) const noexcept
{ {
const uint32_t *rk = _k.sw.dk; const uint32_t *const restrict rk = _k.sw.dk;
uint32_t s0, s1, s2, s3, t0, t1, t2, t3; uint32_t s0, s1, s2, s3, t0, t1, t2, t3;
const uint32_t m8 = 0xff; const uint32_t m8 = 0xff;
s0 = readuint32_t(in) ^ rk[0]; s0 = readuint32_t(in) ^ rk[0];