From f3d849a02e744c062a94928fa7e93a9f7a4ea42c Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Thu, 15 Mar 2018 08:16:10 +0000
Subject: [PATCH] We need to send M_NUL "OPT TLS" before M_NUL "OPT CRYPT".
---
exec/load/binkp.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/exec/load/binkp.js b/exec/load/binkp.js
index 1fb38c3df8..247a6ec295 100644
--- a/exec/load/binkp.js
+++ b/exec/load/binkp.js
@@ -406,8 +406,12 @@ BinkP.prototype.connect = function(addr, password, auth_cb, port, inet_host)
return false;
}
+ /* Check if the first remote comand is an M_NUL "OPT TLS" */
+ pkt = this.recvFrame(this.timeout);
+ if (pkt === undefined)
+ return false;
this.authenticated = undefined;
- if (password !== '-')
+ if (password !== '-' && !this.will_tls)
this.sendCmd(this.command.M_NUL, "OPT CRYPT");
else {
/*
@@ -421,10 +425,6 @@ BinkP.prototype.connect = function(addr, password, auth_cb, port, inet_host)
this.wont_crypt = true;
this.require_crypt = false;
}
- /* Check if the first remote comand is an M_NUL "OPT TLS" */
- pkt = this.recvFrame(this.timeout);
- if (pkt === undefined)
- return false;
this.sendCmd(this.command.M_NUL, "SYS "+this.system_name);
this.sendCmd(this.command.M_NUL, "ZYZ "+this.system_operator);
this.sendCmd(this.command.M_NUL, "LOC "+this.system_location);
--
GitLab