Refresh libusual

diff --git a/Makefile b/Makefile
index 81947a6f875e51b0482d39f38f01c77ba1865423..5f5b3393fabef3a6c2c6bacfaf96777813b2f68c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,9 @@ EXTRA_DIST = AUTHORS COPYRIGHT Makefile \
 
 # libusual files (fixme: list should be provided by libusual...)
 LIBUSUAL_DIST = $(filter-out %/config.h, $(wildcard \
-               lib/usual/*.[chg] lib/m4/*.m4 \
+               lib/usual/*.[chg] \
+               lib/usual/*/*.[ch] \
+               lib/m4/*.m4 \
                lib/usual/config.h.in \
                lib/mk/*.mk \
                lib/mk/antimake.mk lib/mk/antimake.txt \

diff --git a/include/bouncer.h b/include/bouncer.h
index 5dc47ebe5b05427a66a8dcf5554d7e7a0f18b8e5..545ed2c1d73d44bab7c6da8be3aa19eab2d960f7 100644 (file)
--- a/include/bouncer.h
+++ b/include/bouncer.h
@@ -28,7 +28,7 @@
 #include <usual/string.h>
 #include <usual/logging.h>
 #include <usual/aatree.h>
-#include <usual/lookup3.h>
+#include <usual/hashing/lookup3.h>
 #include <usual/slab.h>
 #include <usual/socket.h>
 #include <usual/safeio.h>

diff --git a/lib b/lib
index 94874aa20c111788e1b9b79c4b6e7cd3e6cf6271..36e0ec5425ebfe3fd449a9b05813f5aba758b421 160000 (submodule)
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit 94874aa20c111788e1b9b79c4b6e7cd3e6cf6271
+Subproject commit 36e0ec5425ebfe3fd449a9b05813f5aba758b421

diff --git a/src/util.c b/src/util.c
index e9c1f8c3e8a297941dc4d4996d8d1c7ee96363e0..b7fc0aac5090cef2dd6ba276b5336653a77a0655 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -22,8 +22,7 @@
 
 #include "bouncer.h"
 
-#define MD5_COMPAT
-#include <usual/md5.h>
+#include <usual/crypto/md5.h>
 
 int log_socket_prefix(enum LogLevel lev, void *ctx, char *dst, unsigned int dstlen)
 {
@@ -80,13 +79,13 @@ void pg_md5_encrypt(const char *part1,
                    const char *part2, size_t part2len,
                    char *dest)
 {
-       MD5_CTX ctx;
+       struct md5_ctx ctx;
        uint8_t hash[MD5_DIGEST_LENGTH];
 
-       MD5_Init(&ctx);
-       MD5_Update(&ctx, part1, strlen(part1));
-       MD5_Update(&ctx, part2, part2len);
-       MD5_Final(hash, &ctx);
+       md5_reset(&ctx);
+       md5_update(&ctx, part1, strlen(part1));
+       md5_update(&ctx, part2, part2len);
+       md5_final(&ctx, hash);
 
        memcpy(dest, "md5", 3);
        hash2hex(hash, dest + 3);