From cfa09472a585c534fd05c8a35811cff9ef18965f Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 12 Sep 2019 13:45:36 -0400 Subject: [PATCH] Removed md5.c and md5.h because the APOP implementation which used it is no longer part of Citadel Server --- citadel/Makefile.in | 4 +- citadel/md5.c | 360 -------------------- citadel/md5.h | 31 -- citadel/modules/pop3/serv_pop3.c | 3 +- citadel/modules/rssclient/serv_rssclient.c | 1 - citadel/modules/xmpp/serv_xmpp.c | 1 - citadel/modules/xmpp/xmpp_messages.c | 1 - citadel/modules/xmpp/xmpp_presence.c | 1 - citadel/modules/xmpp/xmpp_query_namespace.c | 1 - citadel/modules/xmpp/xmpp_queue.c | 1 - citadel/modules/xmpp/xmpp_sasl_service.c | 1 - citadel/msgbase.c | 1 - 12 files changed, 3 insertions(+), 403 deletions(-) delete mode 100644 citadel/md5.c delete mode 100644 citadel/md5.h diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 486ae7354..b110ee118 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -77,7 +77,7 @@ SOURCES=utils/citmail.c utils/setup.c utils/chkpw.c \ locate_host.c auth.c msgbase.c parsedate.c \ room_ops.c euidindex.c server_main.c ldap.c \ support.c sysdep.c user_ops.c journaling.c threads.c \ - context.c netconfig.c md5.c + context.c netconfig.c include Make_sources @@ -128,7 +128,7 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o \ internet_addressing.o journaling.o \ parsedate.o genstamp.o threads.o context.o \ clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \ - svn_revision.o ldap.o netconfig.o md5.o + svn_revision.o ldap.o netconfig.o citserver$(EXEEXT): $(SERV_OBJS) $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT) diff --git a/citadel/md5.c b/citadel/md5.c deleted file mode 100644 index a6e0f5af1..000000000 --- a/citadel/md5.c +++ /dev/null @@ -1,360 +0,0 @@ -/* - * This code implements the MD5 message-digest algorithm. - * The algorithm is due to Ron Rivest. This code was - * written by Colin Plumb in 1993, no copyright is claimed. - * This code is in the public domain; do with it what you wish. - * - * Equivalent code is available from RSA Data Security, Inc. - * This code has been tested against that, and is equivalent, - * except that you don't need to include two pages of legalese - * with every copy. - * - * To compute the message digest of a chunk of bytes, declare an - * MD5Context structure, pass it to MD5Init, call MD5Update as - * needed on buffers full of bytes, and then call MD5Final, which - * will fill a supplied 16-byte array with the digest. - */ - -#include -#include -#include -#include /* for memcpy() */ -#include "md5.h" - -#ifndef HIGHFIRST -#define byteReverse(buf, len) /* Nothing */ -#else -void byteReverse(unsigned char *buf, unsigned longs); - -#ifndef ASM_MD5 -/* - * Note: this code is harmless on little-endian machines. - */ -void byteReverse(unsigned char *buf, unsigned longs) -{ - cit_uint32_t t; - do { - t = (cit_uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 - | ((unsigned) buf[1] << 8 | buf[0]); - *(cit_uint32_t *) buf = t; - buf += 4; - } while (--longs); -} -#endif -#endif - - - -/* - * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious - * initialization constants. - */ -void MD5Init(struct MD5Context *ctx) -{ - ctx->buf[0] = 0x67452301; - ctx->buf[1] = 0xefcdab89; - ctx->buf[2] = 0x98badcfe; - ctx->buf[3] = 0x10325476; - - ctx->bits[0] = 0; - ctx->bits[1] = 0; -} - -/* - * Update context to reflect the concatenation of another buffer full - * of bytes. - */ -void MD5Update(struct MD5Context *ctx, unsigned char const *buf, - unsigned len) -{ - cit_uint32_t t; - - /* Update bitcount */ - - t = ctx->bits[0]; - if ((ctx->bits[0] = t + ((cit_uint32_t) len << 3)) < t) - ctx->bits[1]++; /* Carry from low to high */ - ctx->bits[1] += len >> 29; - - t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */ - - /* Handle any leading odd-sized chunks */ - - if (t) { - unsigned char *p = (unsigned char *) ctx->in + t; - - t = 64 - t; - if (len < t) { - memcpy(p, buf, len); - return; - } - memcpy(p, buf, t); - byteReverse(ctx->in, 16); - MD5Transform(ctx->buf, ctx->in); - buf += t; - len -= t; - } - /* Process data in 64-byte chunks */ - - while (len >= 64) { - memcpy(ctx->in, buf, 64); - byteReverse(ctx->in, 16); - MD5Transform(ctx->buf, ctx->in); - buf += 64; - len -= 64; - } - - /* Handle any remaining bytes of data. */ - - memcpy(ctx->in, buf, len); -} - -/* - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - */ -void MD5Final(unsigned char digest[16], struct MD5Context *ctx) -{ - unsigned count; - unsigned char *p; - - /* Compute number of bytes mod 64 */ - count = (ctx->bits[0] >> 3) & 0x3F; - - /* Set the first char of padding to 0x80. This is safe since there is - always at least one byte free */ - p = ((unsigned char *) ctx->in) + count; - *p++ = 0x80; - - /* Bytes of padding needed to make 64 bytes */ - count = 64 - 1 - count; - - /* Pad out to 56 mod 64 */ - if (count < 8) { - /* Two lots of padding: Pad the first block to 64 bytes */ - memset(p, 0, count); - byteReverse(ctx->in, 16); - MD5Transform(ctx->buf, ctx->in); - - /* Now fill the next block with 56 bytes */ - memset(ctx->in, 0, 56); - } else { - /* Pad block to 56 bytes */ - memset(p, 0, count - 8); - } - byteReverse(ctx->in, 14); - - /* Append length in bits and transform */ - ((cit_uint32_t *) ctx->in)[14] = ctx->bits[0]; - ((cit_uint32_t *) ctx->in)[15] = ctx->bits[1]; - - MD5Transform(ctx->buf, (cit_uint32_t *) ctx->in); - byteReverse((unsigned char *) ctx->buf, 4); - memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(struct MD5Context)); /* In case it's sensitive */ -} - -#ifndef ASM_MD5 - -/* The four core functions - F1 is optimized somewhat */ - -/* #define F1(x, y, z) (x & y | ~x & z) */ -#define F1(x, y, z) (z ^ (x & (y ^ z))) -#define F2(x, y, z) F1(z, x, y) -#define F3(x, y, z) (x ^ y ^ z) -#define F4(x, y, z) (y ^ (x | ~z)) - -/* This is the central step in the MD5 algorithm. */ -#ifdef __PUREC__ -#define MD5STEP(f, w, x, y, z, data, s) \ - ( w += f /*(x, y, z)*/ + data, w = w<>(32-s), w += x ) -#else -#define MD5STEP(f, w, x, y, z, data, s) \ - ( w += f(x, y, z) + data, w = w<>(32-s), w += x ) -#endif - -/* - * The core of the MD5 algorithm, this alters an existing MD5 hash to - * reflect the addition of 16 longwords of new data. MD5Update blocks - * the data and converts bytes into longwords for this routine. - */ -void MD5Transform(cit_uint32_t buf[4], cit_uint32_t const in[16]) -{ - register cit_uint32_t a, b, c, d; - - a = buf[0]; - b = buf[1]; - c = buf[2]; - d = buf[3]; - -#ifdef __PUREC__ /* PureC Weirdness... (GG) */ - MD5STEP(F1(b, c, d), a, b, c, d, in[0] + 0xd76aa478L, 7); - MD5STEP(F1(a, b, c), d, a, b, c, in[1] + 0xe8c7b756L, 12); - MD5STEP(F1(d, a, b), c, d, a, b, in[2] + 0x242070dbL, 17); - MD5STEP(F1(c, d, a), b, c, d, a, in[3] + 0xc1bdceeeL, 22); - MD5STEP(F1(b, c, d), a, b, c, d, in[4] + 0xf57c0fafL, 7); - MD5STEP(F1(a, b, c), d, a, b, c, in[5] + 0x4787c62aL, 12); - MD5STEP(F1(d, a, b), c, d, a, b, in[6] + 0xa8304613L, 17); - MD5STEP(F1(c, d, a), b, c, d, a, in[7] + 0xfd469501L, 22); - MD5STEP(F1(b, c, d), a, b, c, d, in[8] + 0x698098d8L, 7); - MD5STEP(F1(a, b, c), d, a, b, c, in[9] + 0x8b44f7afL, 12); - MD5STEP(F1(d, a, b), c, d, a, b, in[10] + 0xffff5bb1L, 17); - MD5STEP(F1(c, d, a), b, c, d, a, in[11] + 0x895cd7beL, 22); - MD5STEP(F1(b, c, d), a, b, c, d, in[12] + 0x6b901122L, 7); - MD5STEP(F1(a, b, c), d, a, b, c, in[13] + 0xfd987193L, 12); - MD5STEP(F1(d, a, b), c, d, a, b, in[14] + 0xa679438eL, 17); - MD5STEP(F1(c, d, a), b, c, d, a, in[15] + 0x49b40821L, 22); - - MD5STEP(F2(b, c, d), a, b, c, d, in[1] + 0xf61e2562L, 5); - MD5STEP(F2(a, b, c), d, a, b, c, in[6] + 0xc040b340L, 9); - MD5STEP(F2(d, a, b), c, d, a, b, in[11] + 0x265e5a51L, 14); - MD5STEP(F2(c, d, a), b, c, d, a, in[0] + 0xe9b6c7aaL, 20); - MD5STEP(F2(b, c, d), a, b, c, d, in[5] + 0xd62f105dL, 5); - MD5STEP(F2(a, b, c), d, a, b, c, in[10] + 0x02441453L, 9); - MD5STEP(F2(d, a, b), c, d, a, b, in[15] + 0xd8a1e681L, 14); - MD5STEP(F2(c, d, a), b, c, d, a, in[4] + 0xe7d3fbc8L, 20); - MD5STEP(F2(b, c, d), a, b, c, d, in[9] + 0x21e1cde6L, 5); - MD5STEP(F2(a, b, c), d, a, b, c, in[14] + 0xc33707d6L, 9); - MD5STEP(F2(d, a, b), c, d, a, b, in[3] + 0xf4d50d87L, 14); - MD5STEP(F2(c, d, a), b, c, d, a, in[8] + 0x455a14edL, 20); - MD5STEP(F2(b, c, d), a, b, c, d, in[13] + 0xa9e3e905L, 5); - MD5STEP(F2(a, b, c), d, a, b, c, in[2] + 0xfcefa3f8L, 9); - MD5STEP(F2(d, a, b), c, d, a, b, in[7] + 0x676f02d9L, 14); - MD5STEP(F2(c, d, a), b, c, d, a, in[12] + 0x8d2a4c8aL, 20); - - MD5STEP(F3(b, c, d), a, b, c, d, in[5] + 0xfffa3942L, 4); - MD5STEP(F3(a, b, c), d, a, b, c, in[8] + 0x8771f681L, 11); - MD5STEP(F3(d, a, b), c, d, a, b, in[11] + 0x6d9d6122L, 16); - MD5STEP(F3(c, d, a), b, c, d, a, in[14] + 0xfde5380cL, 23); - MD5STEP(F3(b, c, d), a, b, c, d, in[1] + 0xa4beea44L, 4); - MD5STEP(F3(a, b, c), d, a, b, c, in[4] + 0x4bdecfa9L, 11); - MD5STEP(F3(d, a, b), c, d, a, b, in[7] + 0xf6bb4b60L, 16); - MD5STEP(F3(c, d, a), b, c, d, a, in[10] + 0xbebfbc70L, 23); - MD5STEP(F3(b, c, d), a, b, c, d, in[13] + 0x289b7ec6L, 4); - MD5STEP(F3(a, b, c), d, a, b, c, in[0] + 0xeaa127faL, 11); - MD5STEP(F3(d, a, b), c, d, a, b, in[3] + 0xd4ef3085L, 16); - MD5STEP(F3(c, d, a), b, c, d, a, in[6] + 0x04881d05L, 23); - MD5STEP(F3(b, c, d), a, b, c, d, in[9] + 0xd9d4d039L, 4); - MD5STEP(F3(a, b, c), d, a, b, c, in[12] + 0xe6db99e5L, 11); - MD5STEP(F3(d, a, b), c, d, a, b, in[15] + 0x1fa27cf8L, 16); - MD5STEP(F3(c, d, a), b, c, d, a, in[2] + 0xc4ac5665L, 23); - - MD5STEP(F4(b, c, d), a, b, c, d, in[0] + 0xf4292244L, 6); - MD5STEP(F4(a, b, c), d, a, b, c, in[7] + 0x432aff97L, 10); - MD5STEP(F4(d, a, b), c, d, a, b, in[14] + 0xab9423a7L, 15); - MD5STEP(F4(c, d, a), b, c, d, a, in[5] + 0xfc93a039L, 21); - MD5STEP(F4(b, c, d), a, b, c, d, in[12] + 0x655b59c3L, 6); - MD5STEP(F4(a, b, c), d, a, b, c, in[3] + 0x8f0ccc92L, 10); - MD5STEP(F4(d, a, b), c, d, a, b, in[10] + 0xffeff47dL, 15); - MD5STEP(F4(c, d, a), b, c, d, a, in[1] + 0x85845dd1L, 21); - MD5STEP(F4(b, c, d), a, b, c, d, in[8] + 0x6fa87e4fL, 6); - MD5STEP(F4(a, b, c), d, a, b, c, in[15] + 0xfe2ce6e0L, 10); - MD5STEP(F4(d, a, b), c, d, a, b, in[6] + 0xa3014314L, 15); - MD5STEP(F4(c, d, a), b, c, d, a, in[13] + 0x4e0811a1L, 21); - MD5STEP(F4(b, c, d), a, b, c, d, in[4] + 0xf7537e82L, 6); - MD5STEP(F4(a, b, c), d, a, b, c, in[11] + 0xbd3af235L, 10); - MD5STEP(F4(d, a, b), c, d, a, b, in[2] + 0x2ad7d2bbL, 15); - MD5STEP(F4(c, d, a), b, c, d, a, in[9] + 0xeb86d391L, 21); -#else - MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); - MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); - MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); - MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); - MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); - MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); - MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); - MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); - MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); - MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); - MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); - MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); - MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); - MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); - MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); - MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); - - MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); - MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); - MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); - MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); - MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); - MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); - MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); - MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); - MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); - MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); - MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); - MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); - MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); - MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); - MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); - MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); - - MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); - MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); - MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); - MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); - MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); - MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); - MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); - MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); - MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); - MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); - MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); - MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); - MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); - MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); - MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); - MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); - - MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); - MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); - MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); - MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); - MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); - MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); - MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); - MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); - MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); - MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); - MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); - MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); - MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); - MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); - MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); - MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); -#endif - - buf[0] += a; - buf[1] += b; - buf[2] += c; - buf[3] += d; -} - -/* - * This part was added by Brian Costello - * For citadel's APOP auth - makes a lower case (as per APOP RFC) - * md5 string - */ - -char *make_apop_string(char *realpass, char *nonce, char *buffer, size_t n) -{ - struct MD5Context ctx; - u_char rawdigest[MD5_DIGEST_LEN]; - int i; - - MD5Init(&ctx); - MD5Update(&ctx, (u_char *) nonce, strlen(nonce)); - MD5Update(&ctx, (u_char *) realpass, strlen(realpass)); - MD5Final(rawdigest, &ctx); - for (i = 0; i < MD5_DIGEST_LEN; i++) { - snprintf(&buffer[i * 2], n - i * 2, "%02X", - (unsigned char) (rawdigest[i] & 0xff)); - buffer[i * 2] = tolower(buffer[i * 2]); - buffer[(i * 2) + 1] = tolower(buffer[(i * 2) + 1]); - } - return buffer; -} - - -#endif diff --git a/citadel/md5.h b/citadel/md5.h deleted file mode 100644 index 8fc29223c..000000000 --- a/citadel/md5.h +++ /dev/null @@ -1,31 +0,0 @@ - -#ifndef MD5_H -#define MD5_H - -#include "sysdep.h" -#include "typesize.h" - -struct MD5Context { - cit_uint32_t buf[4]; - cit_uint32_t bits[2]; - cit_uint32_t in[16]; -}; - -void MD5Init(struct MD5Context *context); -void MD5Update(struct MD5Context *context, unsigned char const *buf, - unsigned len); -void MD5Final(unsigned char digest[16], struct MD5Context *context); -void MD5Transform(cit_uint32_t buf[4], cit_uint32_t const in[16]); -char *make_apop_string(char *realpass, char *nonce, char *buffer, size_t n); - -/* - * This is needed to make RSAREF happy on some MS-DOS compilers. - */ -#ifndef HAVE_OPENSSL -typedef struct MD5Context MD5_CTX; -#endif - -#define MD5_DIGEST_LEN 16 -#define MD5_HEXSTRING_SIZE 33 - -#endif /* !MD5_H */ diff --git a/citadel/modules/pop3/serv_pop3.c b/citadel/modules/pop3/serv_pop3.c index 3058ef315..5a9aa1df9 100644 --- a/citadel/modules/pop3/serv_pop3.c +++ b/citadel/modules/pop3/serv_pop3.c @@ -1,7 +1,7 @@ /* * POP3 service for the Citadel system * - * Copyright (c) 1998-2018 by the citadel.org team + * Copyright (c) 1998-2019 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -57,7 +57,6 @@ #include "msgbase.h" #include "internet_addressing.h" #include "serv_pop3.h" -#include "md5.h" #include "ctdl_module.h" diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index 11ffb905f..4f6677210 100644 --- a/citadel/modules/rssclient/serv_rssclient.c +++ b/citadel/modules/rssclient/serv_rssclient.c @@ -48,7 +48,6 @@ #include "parsedate.h" #include "database.h" #include "citadel_dirs.h" -#include "md5.h" #include "context.h" #include "internet_addressing.h" diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index 6eb0fb6d1..c2d498ba4 100644 --- a/citadel/modules/xmpp/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -53,7 +53,6 @@ #include "database.h" #include "msgbase.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" diff --git a/citadel/modules/xmpp/xmpp_messages.c b/citadel/modules/xmpp/xmpp_messages.c index 4fa690b35..90e09e281 100644 --- a/citadel/modules/xmpp/xmpp_messages.c +++ b/citadel/modules/xmpp/xmpp_messages.c @@ -45,7 +45,6 @@ #include "support.h" #include "config.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c index fef997639..4f71c7eea 100644 --- a/citadel/modules/xmpp/xmpp_presence.c +++ b/citadel/modules/xmpp/xmpp_presence.c @@ -53,7 +53,6 @@ #include "support.h" #include "config.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c index 0a8c3b7a3..f221cc28a 100644 --- a/citadel/modules/xmpp/xmpp_query_namespace.c +++ b/citadel/modules/xmpp/xmpp_query_namespace.c @@ -45,7 +45,6 @@ #include "support.h" #include "config.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" diff --git a/citadel/modules/xmpp/xmpp_queue.c b/citadel/modules/xmpp/xmpp_queue.c index 8cdf1a4d8..4e62aece9 100644 --- a/citadel/modules/xmpp/xmpp_queue.c +++ b/citadel/modules/xmpp/xmpp_queue.c @@ -45,7 +45,6 @@ #include "support.h" #include "config.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c index a6a6734f7..78e05eebe 100644 --- a/citadel/modules/xmpp/xmpp_sasl_service.c +++ b/citadel/modules/xmpp/xmpp_sasl_service.c @@ -48,7 +48,6 @@ #include "config.h" #include "user_ops.h" #include "internet_addressing.h" -#include "md5.h" #include "ctdl_module.h" #include "serv_xmpp.h" diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 2730f8ec3..397826009 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -19,7 +19,6 @@ #include #include #include -#include "md5.h" #include "ctdl_module.h" #include "citserver.h" #include "control.h" -- 2.30.2