From edf5a1f9ae10e8bf78b7d5e2231b977ab84e37d3 Mon Sep 17 00:00:00 2001
From: Deuce <shurd@sasktel.net>
Date: Thu, 26 Nov 2020 02:03:27 -0500
Subject: [PATCH] Remove hack for Mystic v1.12A39 CRAM-MD5 issue.
This has been fixed upstream for some time.
---
exec/binkit.js | 76 +-------------------------------------------------
1 file changed, 1 insertion(+), 75 deletions(-)
diff --git a/exec/binkit.js b/exec/binkit.js
index 0506062944..e2be56fa3f 100644
--- a/exec/binkit.js
+++ b/exec/binkit.js
@@ -911,59 +911,6 @@ function run_outbound(ran)
}
}
-/*
- * MysticBBS v1.12A39 at least has an issue when the CRYPT
- * option is included after the CRAM-MD5 challenge. It appends
- * three NULs to the end of the challenge data. If the remote told
- * us it was Mystic, see if that matches.
- */
-function mystic_broken_cram(bp)
-{
- var dot;
- var min;
- var ver;
-
- if (bp.remote_ver === undefined)
- return false;
- if (bp.remote_ver.substr(0, 7) !== 'Mystic/')
- return false;
- if (bp.wont_crypt)
- return false;
- /*
- * TODO: This is in case Mystic/1.12A39 has both a working and
- * non-working build. Hopefully, this is not the case, and this
- * block can be removed.
- */
- if (bp.remote_ver === 'Mystic/1.12A39')
- return false;
-
- ver = bp.remote_ver.substr(7);
-
- for (dot = 0; dot < ver.length; dot++) {
- if (ver[dot] == '.')
- break;
- }
- if (parseInt(ver.substr(0, dot), 10) < 1)
- return true;
- if (parseInt(ver.substr(0, dot), 10) > 1)
- return false;
- for (min = dot + 1; min < ver.length; min++) {
- if (ver[min] < '0' || ver[min] > '9')
- break;
- }
- if (parseInt(ver.substr(dot+1, min-1), 10) < 12)
- return true;
- if (parseInt(ver.substr(dot+1, min-1), 10) > 12)
- return false;
- if (min > ver.length)
- return false;
- if (ver[min] != 'A')
- return false;
- if (parseInt(ver.substr(min+1), 10) <= 39)
- return true;
- return false;
-}
-
function inbound_auth_cb(pwd, bp)
{
/*
@@ -994,8 +941,6 @@ function inbound_auth_cb(pwd, bp)
if (!cpw)
cpw = '-';
if (pwd[0].substr(0, 9) === 'CRAM-MD5-') {
- if (mystic_broken_cram(bp))
- bp.cram.challenge += '\x00\x00\x00';
var expected = bp.getCRAM('MD5', cpw);
if (expected === pwd[0]) {
log(LOG_INFO, "CRAM-MD5 password match for " + addr);
@@ -1005,26 +950,7 @@ function inbound_auth_cb(pwd, bp)
} else {
log(LOG_WARNING, "CRAM-MD5 password mismatch for " + addr
+ format(" (expected: %s, received: %s)", expected, pwd[0]));
- /*
- * TODO: This is in case Mystic/1.12A39 has both a working and
- * non-working build. Hopefully, this is not the case, and this
- * block can be removed.
- */
- if (bp.remote_ver !== undefined && bp.remote_ver === 'Mystic/1.12A39') {
- log(LOG_INFO, "Checking Mystic pass...");
- bp.cram.challenge += '\x00\x00\x00';
- expected = bp.getCRAM('MD5', cpw);
- if (expected === pwd[0]) {
- log(LOG_INFO, "Mystic CRAM-MD5 password match for " + addr);
- addrs.push(addr);
- check_nocrypt(bp.cb_data.binkitcfg.node[addr]);
- ret = cpw;
- }
- else
- invalid = true;
- }
- else
- invalid = true;
+ invalid = true;
}
}
else {
--
GitLab