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

Rework NEON version of AEGIS256

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-10-21 10:56:09 +00:00
parent 4542a04e1d
commit fd5bc21b60
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_aead/aegis256/arm-crypto/aead_aegis256_armcrypto.c
+17 -14
View File
@@ -2,20 +2,21 @@
#include <stdlib.h>
#include <string.h>
#if defined(__ARM_NEON_FP) || defined(__aarch64__)
#if (defined(__ARM_NEON_FP) || defined(__aarch64__)) && defined(__ARM_FEATURE_CRYPTO)
# include <arm_neon.h>
static inline void
crypto_aead_aegis256_update(uint8x16_t *const state, const uint8x16_t data)
{
uint8x16_t tmp;
uint8x16_t zero = {0};
tmp = vaesmcq_u8(vaeseq_u8(state[5], state[0]));
state[5] = vaesmcq_u8(vaeseq_u8(state[4], state[5]));
state[4] = vaesmcq_u8(vaeseq_u8(state[3], state[4]));
state[3] = vaesmcq_u8(vaeseq_u8(state[2], state[3]));
state[2] = vaesmcq_u8(vaeseq_u8(state[1], state[2]));
state[1] = vaesmcq_u8(vaeseq_u8(state[0], state[1]));
tmp = veorq_u8(vaesmcq_u8(vaeseq_u8(state[5], zero)), state[0]);
state[5] = veorq_u8(vaesmcq_u8(vaeseq_u8(state[4], zero)), state[5]);
state[4] = veorq_u8(vaesmcq_u8(vaeseq_u8(state[3], zero)), state[4]);
state[3] = veorq_u8(vaesmcq_u8(vaeseq_u8(state[2], zero)), state[3]);
state[2] = veorq_u8(vaesmcq_u8(vaeseq_u8(state[1], zero)), state[2]);
state[1] = veorq_u8(vaesmcq_u8(vaeseq_u8(state[0], zero)), state[1]);
state[0] = veorq_u8(tmp, data);
}
@@ -24,12 +25,12 @@ crypto_aead_aegis256_init(const unsigned char *key, const unsigned char *iv,
uint8x16_t *const state)
{
static CRYPTO_ALIGN(16) const unsigned char c1[] = {
0xdd, 0x28, 0xb5, 0x73, 0x42, 0x31, 0x11, 0x20, 0xf1, 0x2f, 0xc2, 0x6d,
0x55, 0x18, 0x3d, 0xdb
0xdb, 0x3d, 0x18, 0x55, 0x6d, 0xc2, 0x2f, 0xf1, 0x20, 0x11, 0x31, 0x42,
0x73, 0xb5, 0x28, 0xdd
};
static CRYPTO_ALIGN(16) const unsigned char c2[] = {
0x62, 0x79, 0xe9, 0x90, 0x59, 0x37, 0x22, 0x15, 0x0d, 0x08, 0x05, 0x03,
0x02, 0x01, 0x01, 0x00
0x00, 0x01, 0x01, 0x02, 0x03, 0x05, 0x08, 0x0d, 0x15, 0x22, 0x37, 0x59,
0x90, 0xe9, 0x79, 0x62
};
uint8x16_t k1;
uint8x16_t k2;
@@ -61,11 +62,13 @@ static void
crypto_aead_aegis256_mac(unsigned char *mac, unsigned long long mlen,
unsigned long long adlen, uint8x16_t *const state)
{
static CRYPTO_ALIGN(16) const uint64_t madlen[] = {
adlen << 3, mlen << 3
};
uint8x16_t tmp;
int i;
int i;
tmp = vreinterpretq_u8_u64(vsetq_lane_u64(mlen << 3,
vmovq_n_u64(adlen << 3), 1));
tmp = vreinterpretq_u8_u64(vld1q_u64(madlen));
tmp = veorq_u8(tmp, state[3]);
for (i = 0; i < 7; i++) {