From 710c36deb9a902ff6c9121cd035d0479ef0a40e9 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 23 Feb 2017 12:05:09 +0100 Subject: [PATCH] s/portable/nacl/g --- .../crypto_stream/aes128ctr/nacl/consts.h | 20 +++++++------- .../crypto_stream/aes128ctr/nacl/int128.h | 27 +++++++++---------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/libsodium/crypto_stream/aes128ctr/nacl/consts.h b/src/libsodium/crypto_stream/aes128ctr/nacl/consts.h index d736f0d3..1abdd3da 100644 --- a/src/libsodium/crypto_stream/aes128ctr/nacl/consts.h +++ b/src/libsodium/crypto_stream/aes128ctr/nacl/consts.h @@ -3,16 +3,16 @@ #include "int128.h" -#define ROTB crypto_stream_aes128ctr_portable_ROTB -#define M0 crypto_stream_aes128ctr_portable_M0 -#define EXPB0 crypto_stream_aes128ctr_portable_EXPB0 -#define SWAP32 crypto_stream_aes128ctr_portable_SWAP32 -#define M0SWAP crypto_stream_aes128ctr_portable_M0SWAP -#define SR crypto_stream_aes128ctr_portable_SR -#define SRM0 crypto_stream_aes128ctr_portable_SRM0 -#define BS0 crypto_stream_aes128ctr_portable_BS0 -#define BS1 crypto_stream_aes128ctr_portable_BS1 -#define BS2 crypto_stream_aes128ctr_portable_BS2 +#define ROTB crypto_stream_aes128ctr_nacl_ROTB +#define M0 crypto_stream_aes128ctr_nacl_M0 +#define EXPB0 crypto_stream_aes128ctr_nacl_EXPB0 +#define SWAP32 crypto_stream_aes128ctr_nacl_SWAP32 +#define M0SWAP crypto_stream_aes128ctr_nacl_M0SWAP +#define SR crypto_stream_aes128ctr_nacl_SR +#define SRM0 crypto_stream_aes128ctr_nacl_SRM0 +#define BS0 crypto_stream_aes128ctr_nacl_BS0 +#define BS1 crypto_stream_aes128ctr_nacl_BS1 +#define BS2 crypto_stream_aes128ctr_nacl_BS2 extern const unsigned char ROTB[16]; extern const unsigned char M0[16]; diff --git a/src/libsodium/crypto_stream/aes128ctr/nacl/int128.h b/src/libsodium/crypto_stream/aes128ctr/nacl/int128.h index 93954c07..cf002b76 100644 --- a/src/libsodium/crypto_stream/aes128ctr/nacl/int128.h +++ b/src/libsodium/crypto_stream/aes128ctr/nacl/int128.h @@ -11,43 +11,40 @@ typedef union { uint8_t u8[16]; } 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); -#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); -#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); -#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); -#define shufb crypto_stream_aes128ctr_portable_shufb +#define shufb crypto_stream_aes128ctr_nacl_shufb 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); -#define rshift32_littleendian \ - crypto_stream_aes128ctr_portable_rshift32_littleendian +#define rshift32_littleendian crypto_stream_aes128ctr_nacl_rshift32_littleendian void rshift32_littleendian(aes_uint128_t *r, const unsigned int n); -#define rshift64_littleendian \ - crypto_stream_aes128ctr_portable_rshift64_littleendian +#define rshift64_littleendian crypto_stream_aes128ctr_nacl_rshift64_littleendian void rshift64_littleendian(aes_uint128_t *r, const unsigned int n); -#define lshift64_littleendian \ - crypto_stream_aes128ctr_portable_lshift64_littleendian +#define lshift64_littleendian crypto_stream_aes128ctr_nacl_lshift64_littleendian 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); -#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); -#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); #endif