diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/loopdev.c | 3 | ||||
| -rw-r--r-- | lib/sha1.c | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/loopdev.c b/lib/loopdev.c index 819aada32..7274f8480 100644 --- a/lib/loopdev.c +++ b/lib/loopdev.c @@ -57,6 +57,9 @@ UL_DEBUG_DEFINE_MASKNAMES(loopdev) = UL_DEBUG_EMPTY_MASKNAMES; #define DBG(m, x) __UL_DBG(loopdev, LOOPDEV_DEBUG_, m, x) #define ON_DBG(m, x) __UL_DBG_CALL(loopdev, LOOPDEV_DEBUG_, m, x) +#define UL_DEBUG_CURRENT_MASK UL_DEBUG_MASK(loopdev) +#include "debugobj.h" + static void loopdev_init_debug(void) { if (loopdev_debug_mask) diff --git a/lib/sha1.c b/lib/sha1.c index e87677c07..22d33b315 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -19,14 +19,11 @@ #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) /* blk0() and blk() perform the initial expand. */ -/* I got the idea of expanding during the round function from SSLeay */ -#if BYTE_ORDER == LITTLE_ENDIAN -# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \ - |(rol(block->l[i],8)&0x00FF00FF)) -#elif BYTE_ORDER == BIG_ENDIAN +#ifdef WORDS_BIGENDIAN # define blk0(i) block->l[i] #else -# error "Endianness not defined!" +# 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] \ |