denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fall back to shifting with 32-bit words if 64-bit byte order conversion function missing

Browse Source
This commit is contained in:
Martin Willi
2010-08-23 10:10:36 +02:00
parent 835ec23aff
commit 4f60466a01
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/gcm/gcm_aead.c
+12 -10
View File
@@ -56,14 +56,16 @@ struct private_gcm_aead_t {
}; };
/** /**
* architecture specific macros to convert a "long" to network order * Find a suiteable word size and network order conversion functions
*/ */
#if ULONG_MAX == 4294967295UL #if ULONG_MAX == 18446744073709551615UL && defined(htobe64)
#define htobelong htobe32 # define htobeword htobe64
#define belongtoh htobe32 # define bewordtoh be64toh
#elif ULONG_MAX == 18446744073709551615UL # define SHIFT_WORD_TYPE u_int64_t
#define htobelong htobe64 #else
#define belongtoh htobe64 # define htobeword htonl
# define bewordtoh ntohl
# define SHIFT_WORD_TYPE u_int32_t
#endif #endif
/** /**
@@ -71,12 +73,12 @@ struct private_gcm_aead_t {
*/ */
static void sr_block(char *block) static void sr_block(char *block)
{ {
u_long *word = (u_long*)block;
int i; int i;
SHIFT_WORD_TYPE *word = (SHIFT_WORD_TYPE*)block;
for (i = 0; i < BLOCK_SIZE / sizeof(*word); i++) for (i = 0; i < BLOCK_SIZE / sizeof(*word); i++)
{ {
word[i] = htobelong(word[i]); word[i] = bewordtoh(word[i]);
} }
for (i = BLOCK_SIZE / sizeof(*word) - 1; i >= 0; i--) for (i = BLOCK_SIZE / sizeof(*word) - 1; i >= 0; i--)
{ {
@@ -88,7 +90,7 @@ static void sr_block(char *block)
} }
for (i = 0; i < BLOCK_SIZE / sizeof(*word); i++) for (i = 0; i < BLOCK_SIZE / sizeof(*word); i++)
{ {
word[i] = belongtoh(word[i]); word[i] = htobeword(word[i]);
} }
} }