diff options
Diffstat (limited to 'module/icp')
| -rw-r--r-- | module/icp/algs/aes/aes_impl_generic.c | 2 | ||||
| -rw-r--r-- | module/icp/algs/edonr/edonr_byteorder.h | 4 | ||||
| -rw-r--r-- | module/icp/algs/modes/ccm.c | 10 | ||||
| -rw-r--r-- | module/icp/algs/sha1/sha1.c | 6 | ||||
| -rw-r--r-- | module/icp/algs/sha2/sha2.c | 4 | ||||
| -rw-r--r-- | module/icp/algs/skein/skein_port.h | 2 |
6 files changed, 13 insertions, 15 deletions
diff --git a/module/icp/algs/aes/aes_impl_generic.c b/module/icp/algs/aes/aes_impl_generic.c index a3b75dbf3..427c096c6 100644 --- a/module/icp/algs/aes/aes_impl_generic.c +++ b/module/icp/algs/aes/aes_impl_generic.c @@ -1233,7 +1233,7 @@ const aes_impl_ops_t aes_generic_impl = { .encrypt = &aes_generic_encrypt, .decrypt = &aes_generic_decrypt, .is_supported = &aes_generic_will_work, -#if defined(_LITTLE_ENDIAN) +#if defined(_ZFS_LITTLE_ENDIAN) .needs_byteswap = B_TRUE, #else .needs_byteswap = B_FALSE, diff --git a/module/icp/algs/edonr/edonr_byteorder.h b/module/icp/algs/edonr/edonr_byteorder.h index 532dfd743..2b5d48287 100644 --- a/module/icp/algs/edonr/edonr_byteorder.h +++ b/module/icp/algs/edonr/edonr_byteorder.h @@ -52,10 +52,10 @@ #endif /* __BYTE_ORDER || BYTE_ORDER */ #if !defined(MACHINE_IS_BIG_ENDIAN) && !defined(MACHINE_IS_LITTLE_ENDIAN) -#if defined(_BIG_ENDIAN) || defined(_MIPSEB) +#if defined(_ZFS_BIG_ENDIAN) || defined(_MIPSEB) #define MACHINE_IS_BIG_ENDIAN #endif -#if defined(_LITTLE_ENDIAN) || defined(_MIPSEL) +#if defined(_ZFS_LITTLE_ENDIAN) || defined(_MIPSEL) #define MACHINE_IS_LITTLE_ENDIAN #endif #endif /* !MACHINE_IS_BIG_ENDIAN && !MACHINE_IS_LITTLE_ENDIAN */ diff --git a/module/icp/algs/modes/ccm.c b/module/icp/algs/modes/ccm.c index c927f0897..5d6507c49 100644 --- a/module/icp/algs/modes/ccm.c +++ b/module/icp/algs/modes/ccm.c @@ -107,13 +107,13 @@ ccm_mode_encrypt_contiguous_blocks(ccm_ctx_t *ctx, char *data, size_t length, * Increment counter. Counter bits are confined * to the bottom 64 bits of the counter block. */ -#ifdef _LITTLE_ENDIAN +#ifdef _ZFS_LITTLE_ENDIAN counter = ntohll(ctx->ccm_cb[1] & ctx->ccm_counter_mask); counter = htonll(counter + 1); #else counter = ctx->ccm_cb[1] & ctx->ccm_counter_mask; counter++; -#endif /* _LITTLE_ENDIAN */ +#endif /* _ZFS_LITTLE_ENDIAN */ counter &= ctx->ccm_counter_mask; ctx->ccm_cb[1] = (ctx->ccm_cb[1] & ~(ctx->ccm_counter_mask)) | counter; @@ -458,13 +458,13 @@ ccm_mode_decrypt_contiguous_blocks(ccm_ctx_t *ctx, char *data, size_t length, * Increment counter. * Counter bits are confined to the bottom 64 bits */ -#ifdef _LITTLE_ENDIAN +#ifdef _ZFS_LITTLE_ENDIAN counter = ntohll(ctx->ccm_cb[1] & ctx->ccm_counter_mask); counter = htonll(counter + 1); #else counter = ctx->ccm_cb[1] & ctx->ccm_counter_mask; counter++; -#endif /* _LITTLE_ENDIAN */ +#endif /* _ZFS_LITTLE_ENDIAN */ counter &= ctx->ccm_counter_mask; ctx->ccm_cb[1] = (ctx->ccm_cb[1] & ~(ctx->ccm_counter_mask)) | counter; @@ -684,7 +684,7 @@ ccm_format_initial_blocks(uchar_t *nonce, ulong_t nonceSize, mask |= (1ULL << q); } -#ifdef _LITTLE_ENDIAN +#ifdef _ZFS_LITTLE_ENDIAN mask = htonll(mask); #endif aes_ctx->ccm_counter_mask = mask; diff --git a/module/icp/algs/sha1/sha1.c b/module/icp/algs/sha1/sha1.c index e4b7a0c8c..da34222c8 100644 --- a/module/icp/algs/sha1/sha1.c +++ b/module/icp/algs/sha1/sha1.c @@ -226,16 +226,14 @@ typedef uint32_t sha1word; * careful programming can guarantee this for us. */ -#if defined(_BIG_ENDIAN) +#if defined(_ZFS_BIG_ENDIAN) #define LOAD_BIG_32(addr) (*(uint32_t *)(addr)) #elif defined(HAVE_HTONL) #define LOAD_BIG_32(addr) htonl(*((uint32_t *)(addr))) #else -/* little endian -- will work on big endian, but slowly */ -#define LOAD_BIG_32(addr) \ - (((addr)[0] << 24) | ((addr)[1] << 16) | ((addr)[2] << 8) | (addr)[3]) +#define LOAD_BIG_32(addr) BE_32(*((uint32_t *)(addr))) #endif /* _BIG_ENDIAN */ /* diff --git a/module/icp/algs/sha2/sha2.c b/module/icp/algs/sha2/sha2.c index 05a2e6ad1..75f6a3c1a 100644 --- a/module/icp/algs/sha2/sha2.c +++ b/module/icp/algs/sha2/sha2.c @@ -43,7 +43,7 @@ #define _RESTRICT_KYWD -#ifdef _LITTLE_ENDIAN +#ifdef _ZFS_LITTLE_ENDIAN #include <sys/byteorder.h> #define HAVE_HTONL #endif @@ -123,7 +123,7 @@ static uint8_t PADDING[128] = { 0x80, /* all zeros */ }; * careful programming can guarantee this for us. */ -#if defined(_BIG_ENDIAN) +#if defined(_ZFS_BIG_ENDIAN) #define LOAD_BIG_32(addr) (*(uint32_t *)(addr)) #define LOAD_BIG_64(addr) (*(uint64_t *)(addr)) diff --git a/module/icp/algs/skein/skein_port.h b/module/icp/algs/skein/skein_port.h index 417ed7c4b..ce4353082 100644 --- a/module/icp/algs/skein/skein_port.h +++ b/module/icp/algs/skein/skein_port.h @@ -44,7 +44,7 @@ #include <sys/isa_defs.h> /* get endianness selection */ -#if defined(_BIG_ENDIAN) +#if defined(_ZFS_BIG_ENDIAN) /* here for big-endian CPUs */ #define SKEIN_NEED_SWAP (1) #else |