From 625a1931ab7c581002bb6ffd573c5ead6b0eb236 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 11 Jan 2022 18:27:00 -0500 Subject: [PATCH] Removed APOP authentication from the text client. No one has ever used it and the server doesn't even support it anymore. --- textclient/Makefile | 4 +- textclient/citadel.c | 43 +---- textclient/citadel_ipc.c | 25 --- textclient/md5.c | 351 --------------------------------------- textclient/textclient.h | 3 +- 5 files changed, 9 insertions(+), 417 deletions(-) delete mode 100644 textclient/md5.c diff --git a/textclient/Makefile b/textclient/Makefile index c42fe6063..7e3ac3d1c 100644 --- a/textclient/Makefile +++ b/textclient/Makefile @@ -1,6 +1,6 @@ # MAKEFILE FOR CITADEL TEXT CLIENT # This file is part of "conf-IG-ure" -# Copyright (C) 2016-2018 by Art Cancro +# Copyright (C) 2016-2022 by Art Cancro # # This program is open source software. Use, duplication, and/or # disclosure are subject to the GNU General Purpose License version 3. @@ -13,7 +13,7 @@ # config.mk is generated by ./configure include config.mk -OBJS := citadel.o citadel_ipc.o client_chat.o client_passwords.o commands.o ipc_c_tcp.o md5.o messages.o rooms.o routines2.o routines.o screen.o tuiconfig.o +OBJS := citadel.o citadel_ipc.o client_chat.o client_passwords.o commands.o ipc_c_tcp.o messages.o rooms.o routines2.o routines.o screen.o tuiconfig.o # link diff --git a/textclient/citadel.c b/textclient/citadel.c index d60dfc1e7..534f721e3 100644 --- a/textclient/citadel.c +++ b/textclient/citadel.c @@ -1374,7 +1374,6 @@ int main(int argc, char **argv) { int a, b, mcmd; char aaa[100], bbb[100]; /* general purpose variables */ char argbuf[64]; /* command line buf */ - char nonce[NONCE_SIZE]; char *telnet_client_host = NULL; char *sptr, *sptr2; /* USed to extract the nonce */ char hexstring[MD5_HEXSTRING_SIZE]; @@ -1473,22 +1472,6 @@ int main(int argc, char **argv) { logoff(ipc, atoi(aaa)); } - /* If there is a [nonce] at the end, put the nonce in , else nonce - * is zeroized. - */ - - if ((sptr = strchr(aaa, '<')) == NULL) { - nonce[0] = '\0'; - } else { - if ((sptr2 = strchr(sptr, '>')) == NULL) { - nonce[0] = '\0'; - } else { - sptr2++; - *sptr2 = '\0'; - strncpy(nonce, sptr, (size_t) NONCE_SIZE); - } - } - #ifdef HAVE_OPENSSL /* Evaluate encryption preferences */ if (arg_encrypt != RC_NO && rc_encrypt != RC_NO) { @@ -1514,19 +1497,13 @@ int main(int argc, char **argv) { if (!IsEmptyStr(fullname)) { r = CtdlIPCTryLogin(ipc, fullname, aaa); if (r / 100 == 3) { - if (*nonce) { - r = CtdlIPCTryApopPassword(ipc, - make_apop_string(password, nonce, hexstring, sizeof hexstring), - aaa); - } else { - r = CtdlIPCTryPassword(ipc, password, aaa); - } + r = CtdlIPCTryPassword(ipc, password, aaa); } - if (r / 100 == 2) { load_user_info(aaa); goto PWOK; - } else { + } + else { set_stored_password(hostbuf, portbuf, "", ""); } } @@ -1570,18 +1547,10 @@ int main(int argc, char **argv) { newprompt("\rPlease enter your password: ", password, -(SIZ - 1)); } - if (*nonce) { - r = CtdlIPCTryApopPassword(ipc, make_apop_string(password, nonce, hexstring, sizeof hexstring), aaa); - if (r / 100 != 2) { - strproc(password); - r = CtdlIPCTryApopPassword(ipc, make_apop_string(password, nonce, hexstring, sizeof hexstring), aaa); - } - } else { + r = CtdlIPCTryPassword(ipc, password, aaa); + if (r / 100 != 2) { + strproc(password); r = CtdlIPCTryPassword(ipc, password, aaa); - if (r / 100 != 2) { - strproc(password); - r = CtdlIPCTryPassword(ipc, password, aaa); - } } if (r / 100 == 2) { diff --git a/textclient/citadel_ipc.c b/textclient/citadel_ipc.c index 52859d65d..2c885af82 100644 --- a/textclient/citadel_ipc.c +++ b/textclient/citadel_ipc.c @@ -282,31 +282,6 @@ int CtdlIPCTryPassword(CtdlIPC * ipc, const char *passwd, char *cret) } -/* - * Second stage of authentication - provide password. The server returns - * 200 and several arguments in cret relating to the user's account. - */ -int CtdlIPCTryApopPassword(CtdlIPC * ipc, const char *response, char *cret) -{ - int ret; - char *aaa; - - if (!response) - return -2; - if (!cret) - return -2; - - aaa = (char *) malloc((size_t) (strlen(response) + 6)); - if (!aaa) - return -1; - - sprintf(aaa, "PAS2 %s", response); - ret = CtdlIPCGenericCommand(ipc, aaa, NULL, 0, NULL, NULL, cret); - free(aaa); - return ret; -} - - /* * Create a new user. This returns 200 plus the same arguments as TryPassword * if selfservice is nonzero, unless there was a problem creating the account. diff --git a/textclient/md5.c b/textclient/md5.c deleted file mode 100644 index 2db76db28..000000000 --- a/textclient/md5.c +++ /dev/null @@ -1,351 +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 "textclient.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) -{ - uint32_t t; - do { - t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 | ((unsigned) buf[1] << 8 | buf[0]); - *(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) -{ - uint32_t t; - - /* Update bitcount */ - - t = ctx->bits[0]; - if ((ctx->bits[0] = t + ((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 */ - ((uint32_t *) ctx->in)[14] = ctx->bits[0]; - ((uint32_t *) ctx->in)[15] = ctx->bits[1]; - - MD5Transform(ctx->buf, (uint32_t *) ctx->in); - byteReverse((unsigned char *) ctx->buf, 4); - memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* 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(uint32_t buf[4], uint32_t const in[16]) -{ - register 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/textclient/textclient.h b/textclient/textclient.h index ee88970bc..7d231d76c 100644 --- a/textclient/textclient.h +++ b/textclient/textclient.h @@ -1,4 +1,4 @@ -// Copyright (c) 1987-2020 by the citadel.org team +// Copyright (c) 1987-2022 by the citadel.org team // // This program is open source software. Use, duplication, and/or // disclosure are subject to the GNU General Purpose License version 3. @@ -25,7 +25,6 @@ #define ROOMNAMELEN 128 // The size of a roomname string #define USERNAME_SIZE 64 // The size of a username string #define MAX_EDITORS 5 // number of external editors supported, must be at least 1 -#define NONCE_SIZE 128 // Added by to allow for APOP auth #define S_KEEPALIVE 30 // How often (in seconds) to send keepalives to the server -- 2.30.2