struct rmd160_ctx {
u64 byte_count;
u32 state[5];
- u32 buffer[16];
+ __le32 buffer[16];
};
-#define K1 0x00000000UL
-#define K2 0x5a827999UL
-#define K3 0x6ed9eba1UL
-#define K4 0x8f1bbcdcUL
-#define K5 0xa953fd4eUL
-#define KK1 0x50a28be6UL
-#define KK2 0x5c4dd124UL
-#define KK3 0x6d703ef3UL
-#define KK4 0x7a6d76e9UL
-#define KK5 0x00000000UL
+#define K1 RMD_K1
+#define K2 RMD_K2
+#define K3 RMD_K3
+#define K4 RMD_K4
+#define K5 RMD_K5
+#define KK1 RMD_K6
+#define KK2 RMD_K7
+#define KK3 RMD_K8
+#define KK4 RMD_K9
+#define KK5 RMD_K1
#define F1(x, y, z) (x ^ y ^ z) /* XOR */
#define F2(x, y, z) (z ^ (x & (y ^ z))) /* x ? y : z */
#define F5(x, y, z) (x ^ (y | ~z))
#define ROUND(a, b, c, d, e, f, k, x, s) { \
- (a) += f((b), (c), (d)) + (x) + (k); \
+ (a) += f((b), (c), (d)) + le32_to_cpup(&(x)) + (k); \
(a) = rol32((a), (s)) + (e); \
(c) = rol32((c), 10); \
}
-static void rmd160_transform(u32 *state, u32 const *in)
+static void rmd160_transform(u32 *state, const __le32 *in)
{
u32 aa, bb, cc, dd, ee, aaa, bbb, ccc, ddd, eee;
return;
}
-static inline void le32_to_cpu_array(u32 *buf, unsigned int words)
-{
- while (words--) {
- le32_to_cpus(buf);
- buf++;
- }
-}
-
-static inline void cpu_to_le32_array(u32 *buf, unsigned int words)
-{
- while (words--) {
- cpu_to_le32s(buf);
- buf++;
- }
-}
-
-static inline void rmd160_transform_helper(struct rmd160_ctx *ctx)
-{
- le32_to_cpu_array(ctx->buffer, sizeof(ctx->buffer) / sizeof(u32));
- rmd160_transform(ctx->state, ctx->buffer);
-}
-
static void rmd160_init(struct crypto_tfm *tfm)
{
struct rmd160_ctx *rctx = crypto_tfm_ctx(tfm);
memcpy((char *)rctx->buffer + (sizeof(rctx->buffer) - avail),
data, avail);
- rmd160_transform_helper(rctx);
+ rmd160_transform(rctx->state, rctx->buffer);
data += avail;
len -= avail;
while (len >= sizeof(rctx->buffer)) {
memcpy(rctx->buffer, data, sizeof(rctx->buffer));
- rmd160_transform_helper(rctx);
+ rmd160_transform(rctx->state, rctx->buffer);
data += sizeof(rctx->buffer);
len -= sizeof(rctx->buffer);
}
static void rmd160_final(struct crypto_tfm *tfm, u8 *out)
{
struct rmd160_ctx *rctx = crypto_tfm_ctx(tfm);
- u32 index, padlen;
- u64 bits;
+ u32 i, index, padlen;
+ __le64 bits;
+ __le32 *dst = (__le32 *)out;
static const u8 padding[64] = { 0x80, };
- bits = rctx->byte_count << 3;
+
+ bits = cpu_to_le64(rctx->byte_count << 3);
/* Pad out to 56 mod 64 */
index = rctx->byte_count & 0x3f;
rmd160_update(tfm, (const u8 *)&bits, sizeof(bits));
/* Store state in digest */
- memcpy(out, rctx->state, sizeof(rctx->state));
+ for (i = 0; i < 5; i++)
+ dst[i] = cpu_to_le32p(&rctx->state[i]);
/* Wipe context */
memset(rctx, 0, sizeof(*rctx));