Commit 87ea330f authored by Rusty Russell's avatar Rusty Russell

Merge remote-tracking branch 'origin/pr/46'

Closes: 46
parents 8bede7d6 3e4263ac
......@@ -40,6 +40,7 @@ int main(int argc, char *argv[])
return 1;
if (strcmp(argv[1], "depends") == 0) {
printf("ccan/compiler\n");
printf("ccan/endian\n");
return 0;
}
......
......@@ -8,6 +8,7 @@
*/
#include <ccan/crypto/ripemd160/ripemd160.h>
#include <ccan/endian/endian.h>
#include <ccan/compiler/compiler.h>
#include <stdbool.h>
#include <assert.h>
#include <string.h>
......@@ -21,7 +22,7 @@ static void invalidate_ripemd160(struct ripemd160_ctx *ctx)
#endif
}
static void check_ripemd160(struct ripemd160_ctx *ctx)
static void check_ripemd160(struct ripemd160_ctx *ctx UNUSED)
{
#ifdef CCAN_CRYPTO_RIPEMD160_USE_OPENSSL
assert(ctx->c.num != -1U);
......@@ -54,19 +55,9 @@ static uint32_t inline f3(uint32_t x, uint32_t y, uint32_t z) { return (x | ~y)
static uint32_t inline f4(uint32_t x, uint32_t y, uint32_t z) { return (x & z) | (y & ~z); }
static uint32_t inline f5(uint32_t x, uint32_t y, uint32_t z) { return x ^ (y | ~z); }
/** Initialize RIPEMD-160 state. */
static void inline Initialize(uint32_t* s)
{
s[0] = 0x67452301ul;
s[1] = 0xEFCDAB89ul;
s[2] = 0x98BADCFEul;
s[3] = 0x10325476ul;
s[4] = 0xC3D2E1F0ul;
}
static uint32_t inline rol(uint32_t x, int i) { return (x << i) | (x >> (32 - i)); }
static void inline Round(uint32_t *a, uint32_t b, uint32_t *c, uint32_t d, uint32_t e, uint32_t f, uint32_t x, uint32_t k, int r)
static void inline Round(uint32_t *a, uint32_t b UNUSED, uint32_t *c, uint32_t d UNUSED, uint32_t e, uint32_t f, uint32_t x, uint32_t k, int r)
{
*a = rol(*a + f + x + k, r) + e;
*c = rol(*c, 10);
......@@ -93,6 +84,7 @@ static void Transform(uint32_t *s, const uint32_t *chunk)
uint32_t w4 = le32_to_cpu(chunk[4]), w5 = le32_to_cpu(chunk[5]), w6 = le32_to_cpu(chunk[6]), w7 = le32_to_cpu(chunk[7]);
uint32_t w8 = le32_to_cpu(chunk[8]), w9 = le32_to_cpu(chunk[9]), w10 = le32_to_cpu(chunk[10]), w11 = le32_to_cpu(chunk[11]);
uint32_t w12 = le32_to_cpu(chunk[12]), w13 = le32_to_cpu(chunk[13]), w14 = le32_to_cpu(chunk[14]), w15 = le32_to_cpu(chunk[15]);
uint32_t t;
R11(&a1, b1, &c1, d1, e1, w0, 11);
R12(&a2, b2, &c2, d2, e2, w5, 8);
......@@ -259,7 +251,7 @@ static void Transform(uint32_t *s, const uint32_t *chunk)
R51(&b1, c1, &d1, e1, a1, w13, 6);
R52(&b2, c2, &d2, e2, a2, w11, 11);
uint32_t t = s[0];
t = s[0];
s[0] = s[1] + c1 + d2;
s[1] = s[2] + d1 + e2;
s[2] = s[3] + e1 + a2;
......@@ -267,7 +259,7 @@ static void Transform(uint32_t *s, const uint32_t *chunk)
s[4] = t + b1 + c2;
}
static bool alignment_ok(const void *p, size_t n)
static bool alignment_ok(const void *p UNUSED, size_t n UNUSED)
{
#if HAVE_UNALIGNED_ACCESS
return true;
......@@ -340,13 +332,13 @@ void ripemd160_done(struct ripemd160_ctx *ctx, struct ripemd160 *res)
}
#endif
void ripemd160(struct ripemd160 *sha, const void *p, size_t size)
void ripemd160(struct ripemd160 *ripemd, const void *p, size_t size)
{
struct ripemd160_ctx ctx;
ripemd160_init(&ctx);
ripemd160_update(&ctx, p, size);
ripemd160_done(&ctx, sha);
ripemd160_done(&ctx, ripemd);
}
void ripemd160_u8(struct ripemd160_ctx *ctx, uint8_t v)
......
......@@ -37,7 +37,7 @@ struct ripemd160 {
* The bytes pointed to by @p is RIPEMD160 hashed into @ripemd160. This is
* equivalent to ripemd160_init(), ripemd160_update() then ripemd160_done().
*/
void ripemd160(struct ripemd160 *sha, const void *p, size_t size);
void ripemd160(struct ripemd160 *ripemd, const void *p, size_t size);
/**
* struct ripemd160_ctx - structure to store running context for ripemd160
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment