From aec5ac012167b76c25e9eeb6ff46870d5160c8d7 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Mon, 1 Jul 2019 20:39:34 -0400 Subject: [PATCH] oops again --- sys/apps/network/trust.lua | 7 +++---- sys/modules/opus/socket.lua | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/apps/network/trust.lua b/sys/apps/network/trust.lua index 7f80427..c31b6ec 100644 --- a/sys/apps/network/trust.lua +++ b/sys/apps/network/trust.lua @@ -13,10 +13,9 @@ local function trustConnection(socket) if not password then socket:write({ msg = 'No password has been set' }) else - pcall(function() - data = Crypto.decrypt(data, password) - end) - if data and data.pk and data.dh == socket.dhost then + local s + s, data = pcall(Crypto.decrypt, data, password) + if s and data and data.pk and data.dh == socket.dhost then local trustList = Util.readTable('usr/.known_hosts') or { } trustList[data.dh] = data.pk Util.writeTable('usr/.known_hosts', trustList) diff --git a/sys/modules/opus/socket.lua b/sys/modules/opus/socket.lua index 0ff53a9..8151855 100644 --- a/sys/modules/opus/socket.lua +++ b/sys/modules/opus/socket.lua @@ -210,7 +210,6 @@ function Socket.server(port, options) local _, _, sport, dport, msg = os.pullEvent('modem_message') if sport == port and - msg and type(msg) == 'table' and msg.dhost == os.getComputerID() and msg.type == 'OPEN' then