s/portable/nacl/g

This commit is contained in:
Frank Denis 2017-02-23 12:05:09 +01:00
parent d26c8adf84
commit 710c36deb9
2 changed files with 22 additions and 25 deletions

View File

@ -3,16 +3,16 @@
#include "int128.h" #include "int128.h"
#define ROTB crypto_stream_aes128ctr_portable_ROTB #define ROTB crypto_stream_aes128ctr_nacl_ROTB
#define M0 crypto_stream_aes128ctr_portable_M0 #define M0 crypto_stream_aes128ctr_nacl_M0
#define EXPB0 crypto_stream_aes128ctr_portable_EXPB0 #define EXPB0 crypto_stream_aes128ctr_nacl_EXPB0
#define SWAP32 crypto_stream_aes128ctr_portable_SWAP32 #define SWAP32 crypto_stream_aes128ctr_nacl_SWAP32
#define M0SWAP crypto_stream_aes128ctr_portable_M0SWAP #define M0SWAP crypto_stream_aes128ctr_nacl_M0SWAP
#define SR crypto_stream_aes128ctr_portable_SR #define SR crypto_stream_aes128ctr_nacl_SR
#define SRM0 crypto_stream_aes128ctr_portable_SRM0 #define SRM0 crypto_stream_aes128ctr_nacl_SRM0
#define BS0 crypto_stream_aes128ctr_portable_BS0 #define BS0 crypto_stream_aes128ctr_nacl_BS0
#define BS1 crypto_stream_aes128ctr_portable_BS1 #define BS1 crypto_stream_aes128ctr_nacl_BS1
#define BS2 crypto_stream_aes128ctr_portable_BS2 #define BS2 crypto_stream_aes128ctr_nacl_BS2
extern const unsigned char ROTB[16]; extern const unsigned char ROTB[16];
extern const unsigned char M0[16]; extern const unsigned char M0[16];

View File

@ -11,43 +11,40 @@ typedef union {
uint8_t u8[16]; uint8_t u8[16];
} aes_uint128_t; } aes_uint128_t;
#define xor2 crypto_stream_aes128ctr_portable_xor2 #define xor2 crypto_stream_aes128ctr_nacl_xor2
void xor2(aes_uint128_t *r, const aes_uint128_t *x); void xor2(aes_uint128_t *r, const aes_uint128_t *x);
#define and2 crypto_stream_aes128ctr_portable_and2 #define and2 crypto_stream_aes128ctr_nacl_and2
void and2(aes_uint128_t *r, const aes_uint128_t *x); void and2(aes_uint128_t *r, const aes_uint128_t *x);
#define or2 crypto_stream_aes128ctr_portable_or2 #define or2 crypto_stream_aes128ctr_nacl_or2
void or2(aes_uint128_t *r, const aes_uint128_t *x); void or2(aes_uint128_t *r, const aes_uint128_t *x);
#define copy2 crypto_stream_aes128ctr_portable_copy2 #define copy2 crypto_stream_aes128ctr_nacl_copy2
void copy2(aes_uint128_t *r, const aes_uint128_t *x); void copy2(aes_uint128_t *r, const aes_uint128_t *x);
#define shufb crypto_stream_aes128ctr_portable_shufb #define shufb crypto_stream_aes128ctr_nacl_shufb
void shufb(aes_uint128_t *r, const unsigned char *l); void shufb(aes_uint128_t *r, const unsigned char *l);
#define shufd crypto_stream_aes128ctr_portable_shufd #define shufd crypto_stream_aes128ctr_nacl_shufd
void shufd(aes_uint128_t *r, const aes_uint128_t *x, const unsigned int c); void shufd(aes_uint128_t *r, const aes_uint128_t *x, const unsigned int c);
#define rshift32_littleendian \ #define rshift32_littleendian crypto_stream_aes128ctr_nacl_rshift32_littleendian
crypto_stream_aes128ctr_portable_rshift32_littleendian
void rshift32_littleendian(aes_uint128_t *r, const unsigned int n); void rshift32_littleendian(aes_uint128_t *r, const unsigned int n);
#define rshift64_littleendian \ #define rshift64_littleendian crypto_stream_aes128ctr_nacl_rshift64_littleendian
crypto_stream_aes128ctr_portable_rshift64_littleendian
void rshift64_littleendian(aes_uint128_t *r, const unsigned int n); void rshift64_littleendian(aes_uint128_t *r, const unsigned int n);
#define lshift64_littleendian \ #define lshift64_littleendian crypto_stream_aes128ctr_nacl_lshift64_littleendian
crypto_stream_aes128ctr_portable_lshift64_littleendian
void lshift64_littleendian(aes_uint128_t *r, const unsigned int n); void lshift64_littleendian(aes_uint128_t *r, const unsigned int n);
#define toggle crypto_stream_aes128ctr_portable_toggle #define toggle crypto_stream_aes128ctr_nacl_toggle
void toggle(aes_uint128_t *r); void toggle(aes_uint128_t *r);
#define xor_rcon crypto_stream_aes128ctr_portable_xor_rcon #define xor_rcon crypto_stream_aes128ctr_nacl_xor_rcon
void xor_rcon(aes_uint128_t *r); void xor_rcon(aes_uint128_t *r);
#define add_uint32_big crypto_stream_aes128ctr_portable_add_uint32_big #define add_uint32_big crypto_stream_aes128ctr_nacl_add_uint32_big
void add_uint32_big(aes_uint128_t *r, uint32_t x); void add_uint32_big(aes_uint128_t *r, uint32_t x);
#endif #endif