Merge pull request #6344 from Citadel-Station-13/upstream-merge-36693

[MIRROR] Slightly bandaid fix for ntnet json/xorencrypt runtimes
This commit is contained in:
deathride58
2018-04-11 21:36:35 +00:00
committed by GitHub
+3 -1
View File
@@ -14,7 +14,9 @@
/datum/netdata/proc/pre_send(datum/component/ntnet_interface/interface)
// Decrypt the passkey.
if(encrypted_passkey && !passkey)
passkey = json_decode(XorEncrypt(hextostr(encrypted_passkey, TRUE), SScircuit.cipherkey))
var/result = XorEncrypt(hextostr(encrypted_passkey, TRUE), SScircuit.cipherkey)
if(length(result) > 1)
passkey = json_decode(XorEncrypt(hextostr(encrypted_passkey, TRUE), SScircuit.cipherkey))
// Encrypt the passkey.
if(!encrypted_passkey && passkey)