From 33da575fd0ac3e0887fe629dd6164fe9aa1eb847 Mon Sep 17 00:00:00 2001 From: Matt Morehouse Date: Tue, 27 Jun 2023 16:25:29 -0500 Subject: [PATCH] ccan: rename ripemd160 functions The symbols were being pulled in from libwally instead of the from our own CCAN. Do the same trick we use for sha256. --- ccan_compat.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ccan_compat.h b/ccan_compat.h index 565327eafdc5..8400d76d1987 100644 --- a/ccan_compat.h +++ b/ccan_compat.h @@ -2,7 +2,8 @@ #define LIGHTNING_CCAN_COMPAT_H /* Magical file included from config.h (ie. everywhere) which renames - * sha256 routines so they don't clash with libwally-core's internal ones */ + * sha256 and ripemd160 routines so they don't clash with libwally-core's + * internal ones */ /* So, for obvious reasons, this is an exception to the usual rule that we #include "config.h" @@ -21,4 +22,19 @@ #define sha256_be16(ctx, v) ccan_sha256_be16(ctx, v) #define sha256_be32(ctx, v) ccan_sha256_be32(ctx, v) #define sha256_be64(ctx, v) ccan_sha256_be64(ctx, v) + +#define ripemd160(sha, p, size) ccan_ripemd160(sha, p, size) +#define ripemd160_init(ctx) ccan_ripemd160_init(ctx) +#define ripemd160_update(ctx, p, size) ccan_ripemd160_update(ctx, p, size) +#define ripemd160_done(ripemd160, res) ccan_ripemd160_done(ripemd160, res) +#define ripemd160_u8(ctx, v) ccan_ripemd160_u8(ctx, v) +#define ripemd160_u16(ctx, v) ccan_ripemd160_u16(ctx, v) +#define ripemd160_u32(ctx, v) ccan_ripemd160_u32(ctx, v) +#define ripemd160_u64(ctx, v) ccan_ripemd160_u64(ctx, v) +#define ripemd160_le16(ctx, v) ccan_ripemd160_le16(ctx, v) +#define ripemd160_le32(ctx, v) ccan_ripemd160_le32(ctx, v) +#define ripemd160_le64(ctx, v) ccan_ripemd160_le64(ctx, v) +#define ripemd160_be16(ctx, v) ccan_ripemd160_be16(ctx, v) +#define ripemd160_be32(ctx, v) ccan_ripemd160_be32(ctx, v) +#define ripemd160_be64(ctx, v) ccan_ripemd160_be64(ctx, v) #endif /* LIGHTNING_CCAN_COMPAT_H */