haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[tidy-exports] properly prefix aesni stuff

Browse Source
This commit is contained in:
Vincent Hanquez 2015-06-21 15:16:05 +01:00
parent e6d3518c2e
commit 69d8dd1a08
4 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cbits/aes/x86ni.c
View File

@ -63,7 +63,7 @@ static __m128i aes_128_key_expansion_aa(__m128i key, __m128i keygened)
return _mm_xor_si128(key, keygened); return _mm_xor_si128(key, keygened);
} }
void aes_ni_init(aes_key *key, uint8_t *ikey, uint8_t size) void cryptonite_aesni_init(aes_key *key, uint8_t *ikey, uint8_t size)
{ {
__m128i k[28]; __m128i k[28];
uint64_t *out = (uint64_t *) key->data; uint64_t *out = (uint64_t *) key->data;

38
cbits/aes/x86ni.h
View File

@ -49,28 +49,28 @@ static void block128_sse_print(__m128i m)
} }
#endif #endif
void aes_ni_init(aes_key *key, uint8_t *origkey, uint8_t size); void cryptonite_aesni_init(aes_key *key, uint8_t *origkey, uint8_t size);
void aes_ni_encrypt_block128(aes_block *out, aes_key *key, aes_block *in); void cryptonite_aesni_encrypt_block128(aes_block *out, aes_key *key, aes_block *in);
void aes_ni_encrypt_block256(aes_block *out, aes_key *key, aes_block *in); void cryptonite_aesni_encrypt_block256(aes_block *out, aes_key *key, aes_block *in);
void aes_ni_decrypt_block128(aes_block *out, aes_key *key, aes_block *in); void cryptonite_aesni_decrypt_block128(aes_block *out, aes_key *key, aes_block *in);
void aes_ni_decrypt_block256(aes_block *out, aes_key *key, aes_block *in); void cryptonite_aesni_decrypt_block256(aes_block *out, aes_key *key, aes_block *in);
void aes_ni_encrypt_ecb128(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks); void cryptonite_aesni_encrypt_ecb128(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks);
void aes_ni_encrypt_ecb256(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks); void cryptonite_aesni_encrypt_ecb256(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks);
void aes_ni_decrypt_ecb128(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks); void cryptonite_aesni_decrypt_ecb128(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks);
void aes_ni_decrypt_ecb256(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks); void cryptonite_aesni_decrypt_ecb256(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks);
void aes_ni_encrypt_cbc128(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks); void cryptonite_aesni_encrypt_cbc128(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks);
void aes_ni_encrypt_cbc256(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks); void cryptonite_aesni_encrypt_cbc256(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks);
void aes_ni_decrypt_cbc128(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks); void cryptonite_aesni_decrypt_cbc128(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks);
void aes_ni_decrypt_cbc256(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks); void cryptonite_aesni_decrypt_cbc256(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks);
void aes_ni_encrypt_ctr128(uint8_t *out, aes_key *key, aes_block *_iv, uint8_t *in, uint32_t length); void cryptonite_aesni_encrypt_ctr128(uint8_t *out, aes_key *key, aes_block *_iv, uint8_t *in, uint32_t length);
void aes_ni_encrypt_ctr256(uint8_t *out, aes_key *key, aes_block *_iv, uint8_t *in, uint32_t length); void cryptonite_aesni_encrypt_ctr256(uint8_t *out, aes_key *key, aes_block *_iv, uint8_t *in, uint32_t length);
void aes_ni_encrypt_xts128(aes_block *out, aes_key *key1, aes_key *key2, void cryptonite_aesni_encrypt_xts128(aes_block *out, aes_key *key1, aes_key *key2,
aes_block *_tweak, uint32_t spoint, aes_block *in, uint32_t blocks); aes_block *_tweak, uint32_t spoint, aes_block *in, uint32_t blocks);
void aes_ni_encrypt_xts256(aes_block *out, aes_key *key1, aes_key *key2, void cryptonite_aesni_encrypt_xts256(aes_block *out, aes_key *key1, aes_key *key2,
aes_block *_tweak, uint32_t spoint, aes_block *in, uint32_t blocks); aes_block *_tweak, uint32_t spoint, aes_block *in, uint32_t blocks);
void aes_ni_gcm_encrypt128(uint8_t *out, aes_gcm *gcm, aes_key *key, uint8_t *in, uint32_t length); void cryptonite_aesni_gcm_encrypt128(uint8_t *out, aes_gcm *gcm, aes_key *key, uint8_t *in, uint32_t length);
void aes_ni_gcm_encrypt256(uint8_t *out, aes_gcm *gcm, aes_key *key, uint8_t *in, uint32_t length); void cryptonite_aesni_gcm_encrypt256(uint8_t *out, aes_gcm *gcm, aes_key *key, uint8_t *in, uint32_t length);
void gf_mul_x86ni(block128 *res, block128 *a_, block128 *b_); void gf_mul_x86ni(block128 *res, block128 *a_, block128 *b_);

18
cbits/aes/x86ni_impl.c
View File

@ -28,7 +28,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
void SIZED(aes_ni_encrypt_block)(aes_block *out, aes_key *key, aes_block *in) void SIZED(cryptonite_aesni_encrypt_block)(aes_block *out, aes_key *key, aes_block *in)
{ {
__m128i *k = (__m128i *) key->data; __m128i *k = (__m128i *) key->data;
PRELOAD_ENC(k); PRELOAD_ENC(k);
@ -37,7 +37,7 @@ void SIZED(aes_ni_encrypt_block)(aes_block *out, aes_key *key, aes_block *in)
_mm_storeu_si128((__m128i *) out, m); _mm_storeu_si128((__m128i *) out, m);
} }
void SIZED(aes_ni_decrypt_block)(aes_block *out, aes_key *key, aes_block *in) void SIZED(cryptonite_aesni_decrypt_block)(aes_block *out, aes_key *key, aes_block *in)
{ {
__m128i *k = (__m128i *) key->data; __m128i *k = (__m128i *) key->data;
PRELOAD_DEC(k); PRELOAD_DEC(k);
@ -46,7 +46,7 @@ void SIZED(aes_ni_decrypt_block)(aes_block *out, aes_key *key, aes_block *in)
_mm_storeu_si128((__m128i *) out, m); _mm_storeu_si128((__m128i *) out, m);
} }
void SIZED(aes_ni_encrypt_ecb)(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks) void SIZED(cryptonite_aesni_encrypt_ecb)(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks)
{ {
__m128i *k = (__m128i *) key->data; __m128i *k = (__m128i *) key->data;
@ -58,7 +58,7 @@ void SIZED(aes_ni_encrypt_ecb)(aes_block *out, aes_key *key, aes_block *in, uint
} }
} }
void SIZED(aes_ni_decrypt_ecb)(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks) void SIZED(cryptonite_aesni_decrypt_ecb)(aes_block *out, aes_key *key, aes_block *in, uint32_t blocks)
{ {
__m128i *k = (__m128i *) key->data; __m128i *k = (__m128i *) key->data;
@ -71,7 +71,7 @@ void SIZED(aes_ni_decrypt_ecb)(aes_block *out, aes_key *key, aes_block *in, uint
} }
} }
void SIZED(aes_ni_encrypt_cbc)(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks) void SIZED(cryptonite_aesni_encrypt_cbc)(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks)
{ {
__m128i *k = (__m128i *) key->data; __m128i *k = (__m128i *) key->data;
__m128i iv = _mm_loadu_si128((__m128i *) _iv); __m128i iv = _mm_loadu_si128((__m128i *) _iv);
@ -87,7 +87,7 @@ void SIZED(aes_ni_encrypt_cbc)(aes_block *out, aes_key *key, aes_block *_iv, aes
} }
} }
void SIZED(aes_ni_decrypt_cbc)(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks) void SIZED(cryptonite_aesni_decrypt_cbc)(aes_block *out, aes_key *key, aes_block *_iv, aes_block *in, uint32_t blocks)
{ {
__m128i *k = (__m128i *) key->data; __m128i *k = (__m128i *) key->data;
__m128i iv = _mm_loadu_si128((__m128i *) _iv); __m128i iv = _mm_loadu_si128((__m128i *) _iv);
@ -106,7 +106,7 @@ void SIZED(aes_ni_decrypt_cbc)(aes_block *out, aes_key *key, aes_block *_iv, aes
} }
} }
void SIZED(aes_ni_encrypt_ctr)(uint8_t *output, aes_key *key, aes_block *_iv, uint8_t *input, uint32_t len) void SIZED(cryptonite_aesni_encrypt_ctr)(uint8_t *output, aes_key *key, aes_block *_iv, uint8_t *input, uint32_t len)
{ {
__m128i *k = (__m128i *) key->data; __m128i *k = (__m128i *) key->data;
__m128i bswap_mask = _mm_setr_epi8(7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8); __m128i bswap_mask = _mm_setr_epi8(7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8);
@ -151,7 +151,7 @@ void SIZED(aes_ni_encrypt_ctr)(uint8_t *output, aes_key *key, aes_block *_iv, ui
return ; return ;
} }
void SIZED(aes_ni_encrypt_xts)(aes_block *out, aes_key *key1, aes_key *key2, void SIZED(cryptonite_aesni_encrypt_xts)(aes_block *out, aes_key *key1, aes_key *key2,
aes_block *_tweak, uint32_t spoint, aes_block *in, uint32_t blocks) aes_block *_tweak, uint32_t spoint, aes_block *in, uint32_t blocks)
{ {
__m128i tweak = _mm_loadu_si128((__m128i *) _tweak); __m128i tweak = _mm_loadu_si128((__m128i *) _tweak);
@ -181,7 +181,7 @@ void SIZED(aes_ni_encrypt_xts)(aes_block *out, aes_key *key1, aes_key *key2,
} while (0); } while (0);
} }
void SIZED(aes_ni_gcm_encrypt)(uint8_t *output, aes_gcm *gcm, aes_key *key, uint8_t *input, uint32_t length) void SIZED(cryptonite_aesni_gcm_encrypt)(uint8_t *output, aes_gcm *gcm, aes_key *key, uint8_t *input, uint32_t length)
{ {
__m128i *k = (__m128i *) key->data; __m128i *k = (__m128i *) key->data;
__m128i bswap_mask = _mm_setr_epi8(7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8); __m128i bswap_mask = _mm_setr_epi8(7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8);

44
cbits/cryptonite_aes.c
View File

@ -191,36 +191,36 @@ static void initialize_table_ni(int aesni, int pclmul)
{ {
if (!aesni) if (!aesni)
return; return;
cryptonite_aes_branch_table[INIT_128] = aes_ni_init; cryptonite_aes_branch_table[INIT_128] = cryptonite_aesni_init;
cryptonite_aes_branch_table[INIT_256] = aes_ni_init; cryptonite_aes_branch_table[INIT_256] = cryptonite_aesni_init;
cryptonite_aes_branch_table[ENCRYPT_BLOCK_128] = aes_ni_encrypt_block128; cryptonite_aes_branch_table[ENCRYPT_BLOCK_128] = cryptonite_aesni_encrypt_block128;
cryptonite_aes_branch_table[DECRYPT_BLOCK_128] = aes_ni_decrypt_block128; cryptonite_aes_branch_table[DECRYPT_BLOCK_128] = cryptonite_aesni_decrypt_block128;
cryptonite_aes_branch_table[ENCRYPT_BLOCK_256] = aes_ni_encrypt_block256; cryptonite_aes_branch_table[ENCRYPT_BLOCK_256] = cryptonite_aesni_encrypt_block256;
cryptonite_aes_branch_table[DECRYPT_BLOCK_256] = aes_ni_decrypt_block256; cryptonite_aes_branch_table[DECRYPT_BLOCK_256] = cryptonite_aesni_decrypt_block256;
/* ECB */ /* ECB */
cryptonite_aes_branch_table[ENCRYPT_ECB_128] = aes_ni_encrypt_ecb128; cryptonite_aes_branch_table[ENCRYPT_ECB_128] = cryptonite_aesni_encrypt_ecb128;
cryptonite_aes_branch_table[DECRYPT_ECB_128] = aes_ni_decrypt_ecb128; cryptonite_aes_branch_table[DECRYPT_ECB_128] = cryptonite_aesni_decrypt_ecb128;
cryptonite_aes_branch_table[ENCRYPT_ECB_256] = aes_ni_encrypt_ecb256; cryptonite_aes_branch_table[ENCRYPT_ECB_256] = cryptonite_aesni_encrypt_ecb256;
cryptonite_aes_branch_table[DECRYPT_ECB_256] = aes_ni_decrypt_ecb256; cryptonite_aes_branch_table[DECRYPT_ECB_256] = cryptonite_aesni_decrypt_ecb256;
/* CBC */ /* CBC */
cryptonite_aes_branch_table[ENCRYPT_CBC_128] = aes_ni_encrypt_cbc128; cryptonite_aes_branch_table[ENCRYPT_CBC_128] = cryptonite_aesni_encrypt_cbc128;
cryptonite_aes_branch_table[DECRYPT_CBC_128] = aes_ni_decrypt_cbc128; cryptonite_aes_branch_table[DECRYPT_CBC_128] = cryptonite_aesni_decrypt_cbc128;
cryptonite_aes_branch_table[ENCRYPT_CBC_256] = aes_ni_encrypt_cbc256; cryptonite_aes_branch_table[ENCRYPT_CBC_256] = cryptonite_aesni_encrypt_cbc256;
cryptonite_aes_branch_table[DECRYPT_CBC_256] = aes_ni_decrypt_cbc256; cryptonite_aes_branch_table[DECRYPT_CBC_256] = cryptonite_aesni_decrypt_cbc256;
/* CTR */ /* CTR */
cryptonite_aes_branch_table[ENCRYPT_CTR_128] = aes_ni_encrypt_ctr128; cryptonite_aes_branch_table[ENCRYPT_CTR_128] = cryptonite_aesni_encrypt_ctr128;
cryptonite_aes_branch_table[ENCRYPT_CTR_256] = aes_ni_encrypt_ctr256; cryptonite_aes_branch_table[ENCRYPT_CTR_256] = cryptonite_aesni_encrypt_ctr256;
/* XTS */ /* XTS */
cryptonite_aes_branch_table[ENCRYPT_XTS_128] = aes_ni_encrypt_xts128; cryptonite_aes_branch_table[ENCRYPT_XTS_128] = cryptonite_aesni_encrypt_xts128;
cryptonite_aes_branch_table[ENCRYPT_XTS_256] = aes_ni_encrypt_xts256; cryptonite_aes_branch_table[ENCRYPT_XTS_256] = cryptonite_aesni_encrypt_xts256;
/* GCM */ /* GCM */
cryptonite_aes_branch_table[ENCRYPT_GCM_128] = aes_ni_gcm_encrypt128; cryptonite_aes_branch_table[ENCRYPT_GCM_128] = cryptonite_aesni_gcm_encrypt128;
cryptonite_aes_branch_table[ENCRYPT_GCM_256] = aes_ni_gcm_encrypt256; cryptonite_aes_branch_table[ENCRYPT_GCM_256] = cryptonite_aesni_gcm_encrypt256;
/* OCB */ /* OCB */
/* /*
cryptonite_aes_branch_table[ENCRYPT_OCB_128] = aes_ni_ocb_encrypt128; cryptonite_aes_branch_table[ENCRYPT_OCB_128] = cryptonite_aesni_ocb_encrypt128;
cryptonite_aes_branch_table[ENCRYPT_OCB_256] = aes_ni_ocb_encrypt256; cryptonite_aes_branch_table[ENCRYPT_OCB_256] = cryptonite_aesni_ocb_encrypt256;
*/ */
} }
#endif #endif