QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add explicit casts and make things a bit more consistent

Browse Source
This commit is contained in:
Frank Denis
2020-05-19 17:40:18 +02:00
parent c3ca08913c
commit da3fc4dd91
3 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_aead/aegis128l/aesni/aead_aegis128l_aesni.c
+15 -13
View File
@@ -56,8 +56,8 @@ crypto_aead_aegis128l_init(const unsigned char *key, const unsigned char *iv, __
__m128i k1, k2;
int i;
k1 = _mm_loadu_si128((__m128i *) key);
k2 = _mm_xor_si128(k1, _mm_loadu_si128((__m128i *) iv));
k1 = _mm_loadu_si128((const __m128i *) (const void *) key);
k2 = _mm_xor_si128(k1, _mm_loadu_si128((const __m128i *) (const void *) iv));
state[0] = k2;
state[1] = c1;
@@ -93,7 +93,7 @@ crypto_aead_aegis128l_mac(unsigned char *mac, unsigned long long mlen, unsigned
tmp = _mm_xor_si128(tmp, state[1]);
tmp = _mm_xor_si128(tmp, state[0]);
_mm_storeu_si128((__m128i *) mac, tmp);
_mm_storeu_si128((__m128i *) (void *) mac, tmp);
}
static void
@@ -103,16 +103,16 @@ crypto_aead_aegis128l_enc(unsigned char *const dst, const unsigned char *const s
__m128i msg0, msg1;
__m128i tmp0, tmp1;
msg0 = _mm_loadu_si128((__m128i *) src);
msg1 = _mm_loadu_si128((__m128i *) (src + 16));
msg0 = _mm_loadu_si128((const __m128i *) (const void *) src);
msg1 = _mm_loadu_si128((const __m128i *) (const void *) (src + 16));
tmp0 = _mm_xor_si128(msg0, state[6]);
tmp0 = _mm_xor_si128(tmp0, state[1]);
tmp1 = _mm_xor_si128(msg1, state[2]);
tmp1 = _mm_xor_si128(tmp1, state[5]);
tmp0 = _mm_xor_si128(tmp0, _mm_and_si128(state[2], state[3]));
tmp1 = _mm_xor_si128(tmp1, _mm_and_si128(state[6], state[7]));
_mm_storeu_si128((__m128i *) dst, tmp0);
_mm_storeu_si128((__m128i *) (dst + 16), tmp1);
_mm_storeu_si128((__m128i *) (void *) dst, tmp0);
_mm_storeu_si128((__m128i *) (void *) (dst + 16), tmp1);
crypto_aead_aegis128l_update(state, msg0, msg1);
}
@@ -123,16 +123,16 @@ crypto_aead_aegis128l_dec(unsigned char *const dst, const unsigned char *const s
{
__m128i msg0, msg1;
msg0 = _mm_loadu_si128((__m128i *) src);
msg1 = _mm_loadu_si128((__m128i *) (src + 16));
msg0 = _mm_loadu_si128((const __m128i *) (const void *) src);
msg1 = _mm_loadu_si128((const __m128i *) (const void *) (src + 16));
msg0 = _mm_xor_si128(msg0, state[6]);
msg0 = _mm_xor_si128(msg0, state[1]);
msg1 = _mm_xor_si128(msg1, state[2]);
msg1 = _mm_xor_si128(msg1, state[5]);
msg0 = _mm_xor_si128(msg0, _mm_and_si128(state[2], state[3]));
msg1 = _mm_xor_si128(msg1, _mm_and_si128(state[6], state[7]));
_mm_storeu_si128((__m128i *) dst, msg0);
_mm_storeu_si128((__m128i *) (dst + 16), msg1);
_mm_storeu_si128((__m128i *) (void *) dst, msg0);
_mm_storeu_si128((__m128i *) (void *) (dst + 16), msg1);
crypto_aead_aegis128l_update(state, msg0, msg1);
}
@@ -247,8 +247,10 @@ crypto_aead_aegis128l_decrypt_detached(unsigned char *m, unsigned char *nsec, co
memcpy(m + i, dst, mlen & 0x1f);
}
memset(dst, 0, mlen & 0x1f);
state[0] = _mm_xor_si128(state[0], _mm_loadu_si128((__m128i *) dst));
state[4] = _mm_xor_si128(state[4], _mm_loadu_si128((__m128i *) (dst + 16)));
state[0] = _mm_xor_si128(state[0],
_mm_loadu_si128((const __m128i *) (const void *) dst));
state[4] = _mm_xor_si128(state[4],
_mm_loadu_si128((const __m128i *) (const void *) (dst + 16)));
}
crypto_aead_aegis128l_mac(computed_mac, mlen, adlen, state);
src/libsodium/crypto_aead/aegis256/aesni/aead_aegis256_aesni.c
+20 -20
View File
@@ -44,25 +44,24 @@ crypto_aead_aegis256_update(__m128i *const state, const __m128i data)
static void
crypto_aead_aegis256_init(const unsigned char *key, const unsigned char *iv, __m128i *const state)
{
__m128i k1;
__m128i k2;
__m128i k3;
__m128i k4;
const __m128i c1 = _mm_set_epi8(0xdd, 0x28, 0xb5, 0x73, 0x42, 0x31, 0x11, 0x20, 0xf1, 0x2f, 0xc2, 0x6d,
0x55, 0x18, 0x3d, 0xdb);
const __m128i c2 = _mm_set_epi8(0x62, 0x79, 0xe9, 0x90, 0x59, 0x37, 0x22, 0x15, 0x0d, 0x08, 0x05, 0x03,
0x02, 0x01, 0x01, 0x00);
__m128i k1, k2, k3, k4;
int i;
k1 = _mm_loadu_si128((__m128i *) &key[0]);
k2 = _mm_loadu_si128((__m128i *) &key[16]);
k3 = _mm_xor_si128(k1, _mm_loadu_si128((__m128i *) &iv[0]));
k4 = _mm_xor_si128(k2, _mm_loadu_si128((__m128i *) &iv[16]));
k1 = _mm_loadu_si128((const __m128i *) (const void *) &key[0]);
k2 = _mm_loadu_si128((const __m128i *) (const void *) &key[16]);
k3 = _mm_xor_si128(k1, _mm_loadu_si128((__m128i *) (void *) &iv[0]));
k4 = _mm_xor_si128(k2, _mm_loadu_si128((__m128i *) (void *) &iv[16]));
state[0] = k3;
state[1] = k4;
state[2] = _mm_set_epi8(0xdd, 0x28, 0xb5, 0x73, 0x42, 0x31, 0x11, 0x20, 0xf1, 0x2f, 0xc2, 0x6d,
0x55, 0x18, 0x3d, 0xdb);
state[3] = _mm_set_epi8(0x62, 0x79, 0xe9, 0x90, 0x59, 0x37, 0x22, 0x15, 0x0d, 0x08, 0x05, 0x03,
0x02, 0x01, 0x01, 0x00);
state[4] = _mm_xor_si128(k1, state[3]);
state[5] = _mm_xor_si128(k2, state[2]);
state[2] = c1;
state[3] = c2;
state[4] = _mm_xor_si128(k1, c2);
state[5] = _mm_xor_si128(k2, c1);
for (i = 0; i < 4; i++) {
crypto_aead_aegis256_update(state, k1);
@@ -92,7 +91,7 @@ crypto_aead_aegis256_mac(unsigned char *mac, unsigned long long mlen, unsigned l
tmp = _mm_xor_si128(tmp, state[1]);
tmp = _mm_xor_si128(tmp, state[0]);
_mm_storeu_si128((__m128i *) mac, tmp);
_mm_storeu_si128((__m128i *) (void *) mac, tmp);
}
static void
@@ -102,12 +101,12 @@ crypto_aead_aegis256_enc(unsigned char *const dst, const unsigned char *const sr
__m128i msg;
__m128i tmp;
msg = _mm_loadu_si128((__m128i *) src);
msg = _mm_loadu_si128((const __m128i *) (const void *) src);
tmp = _mm_xor_si128(msg, state[5]);
tmp = _mm_xor_si128(tmp, state[4]);
tmp = _mm_xor_si128(tmp, state[1]);
tmp = _mm_xor_si128(tmp, _mm_and_si128(state[2], state[3]));
_mm_storeu_si128((__m128i *) dst, tmp);
_mm_storeu_si128((__m128i *) (void *) dst, tmp);
crypto_aead_aegis256_update(state, msg);
}
@@ -118,12 +117,12 @@ crypto_aead_aegis256_dec(unsigned char *const dst, const unsigned char *const sr
{
__m128i msg;
msg = _mm_loadu_si128((__m128i *) src);
msg = _mm_loadu_si128((const __m128i *) (const void *) src);
msg = _mm_xor_si128(msg, state[5]);
msg = _mm_xor_si128(msg, state[4]);
msg = _mm_xor_si128(msg, state[1]);
msg = _mm_xor_si128(msg, _mm_and_si128(state[2], state[3]));
_mm_storeu_si128((__m128i *) dst, msg);
_mm_storeu_si128((__m128i *) (void *) dst, msg);
crypto_aead_aegis256_update(state, msg);
}
@@ -238,7 +237,8 @@ crypto_aead_aegis256_decrypt_detached(unsigned char *m, unsigned char *nsec, con
memcpy(m + i, dst, mlen & 0xf);
}
memset(dst, 0, mlen & 0xf);
state[0] = _mm_xor_si128(state[0], _mm_loadu_si128((__m128i *) dst));
state[0] = _mm_xor_si128(state[0],
_mm_loadu_si128((const __m128i *) (const void *) dst));
}
crypto_aead_aegis256_mac(computed_mac, mlen, adlen, state);
src/libsodium/crypto_aead/aegis256/armcrypto/aead_aegis256_armcrypto.c
+10 -11
View File
@@ -35,19 +35,18 @@ static void
crypto_aead_aegis256_init(const unsigned char *key, const unsigned char *iv,
uint8x16_t *const state)
{
static CRYPTO_ALIGN(16) const unsigned char c1[] = {
static CRYPTO_ALIGN(16) const unsigned char c1_[] = {
0xdb, 0x3d, 0x18, 0x55, 0x6d, 0xc2, 0x2f, 0xf1, 0x20, 0x11, 0x31, 0x42,
0x73, 0xb5, 0x28, 0xdd
};
static CRYPTO_ALIGN(16) const unsigned char c2[] = {
static CRYPTO_ALIGN(16) const unsigned char c2_[] = {
0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59,
0x90, 0xe9, 0x79, 0x62
};
uint8x16_t k1;
uint8x16_t k2;
uint8x16_t k3;
uint8x16_t k4;
int i;
const uint8x16_t c1 = vld1q_u8(c1_);
const uint8x16_t c2 = vld1q_u8(c2_);
uint8x16_t k1, k2, k3, k4;
int i;
k1 = vld1q_u8(&key[0]);
k2 = vld1q_u8(&key[16]);
@@ -56,10 +55,10 @@ crypto_aead_aegis256_init(const unsigned char *key, const unsigned char *iv,
state[0] = k3;
state[1] = k4;
state[2] = vld1q_u8(c1);
state[3] = vld1q_u8(c2);
state[4] = veorq_u8(k1, state[3]);
state[5] = veorq_u8(k2, state[2]);
state[2] = c1;
state[3] = c2;
state[4] = veorq_u8(k1, c2);
state[5] = veorq_u8(k2, c1);
for (i = 0; i < 4; i++) {
crypto_aead_aegis256_update(state, k1);