aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Added patch from @pasis for big endian architectures

Browse Source
This commit is contained in:
James Booth 2014-10-21 23:56:24 +01:00
parent a10c790260
commit a78891b8b3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/p_sha1.c
View File

@ -101,19 +101,14 @@ A million repetitions of "a"
#include "p_sha1.h" #include "p_sha1.h"
static uint32_t host_to_be(uint32_t i);
void P_SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]); void P_SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]);
#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
/* blk0() and blk() perform the initial expand. */ /* blk0() and blk() perform the initial expand. */
/* I got the idea of expanding during the round function from SSLeay */ /* I got the idea of expanding during the round function from SSLeay */
/* FIXME: can we do this in an endian-proof way? */ #define blk0(i) (block->l[i] = host_to_be(block->l[i]))
#ifdef WORDS_BIGENDIAN
#define blk0(i) block->l[i]
#else
#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
|(rol(block->l[i],8)&0x00FF00FF))
#endif
#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \ #define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
^block->l[(i+2)&15]^block->l[i&15],1)) ^block->l[(i+2)&15]^block->l[i&15],1))
@ -138,6 +133,15 @@ void SHAPrintContext(P_P_SHA1_CTX *context, char *msg){
} }
#endif /* VERBOSE */ #endif /* VERBOSE */
static uint32_t host_to_be(uint32_t i)
{
static const union {
unsigned u;
unsigned char c;
} check = {1};
return check.c ? (rol(i,24)&0xFF00FF00)|(rol(i,8)&0x00FF00FF) : i;
}
/* Hash a single 512-bit block. This is the core of the algorithm. */ /* Hash a single 512-bit block. This is the core of the algorithm. */
void P_SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]) void P_SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
{ {