From 02217467562da991c5f3335d4847510ac312c981 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Tue, 5 Mar 2019 20:52:52 -0500 Subject: Added a new API and made changes on the post setup --- README.md | 1 + startup.lua | 5 +- system/apis/sha256.lua | 194 +++++++++++++++++++++++++++++++++++++++++++++++++ system/boot.lua | 4 +- system/post-setup.lua | 33 +++++++++ system/setup.lua | 29 -------- 6 files changed, 233 insertions(+), 33 deletions(-) create mode 100644 system/apis/sha256.lua create mode 100644 system/post-setup.lua delete mode 100644 system/setup.lua diff --git a/README.md b/README.md index babbc99..c4dc0a6 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ The programs/apis I used for bits-UI. - LuaIDE by GravityScore - Mouse File Browser by Stiepen irc(Kilobyte), Cruor and BigSHinyToys - fLib by NDFJay +- Sha256 by CompuTech # Installation If you want to get this running be sure to have a ComputerCraft emulator such as CCEmuRedux or CCEmuX. But if you want to run this in minecraft be sure to have CC-Tweaked. diff --git a/startup.lua b/startup.lua index 82c5a06..e3533d4 100644 --- a/startup.lua +++ b/startup.lua @@ -14,6 +14,7 @@ ]]-- local boot = "/system/boot.lua" +local allowUpdate = true function bootloader() term.setCursorPos(1,1) @@ -42,8 +43,8 @@ function bootloaderInput() shell.run("/system/boot.lua") elseif input == "2" then clear() - if fs.exists("dev_mode") then - print("You are running developer mode! You cannot update bit-UI.") + if allowUpdate == false then + print("You have set updating to false!\n Please set updating to true if you want to update...") sleep(3) clear() bootloader() diff --git a/system/apis/sha256.lua b/system/apis/sha256.lua new file mode 100644 index 0000000..9c57269 --- /dev/null +++ b/system/apis/sha256.lua @@ -0,0 +1,194 @@ +-- From http://pastebin.com/gsFrNjbt linked from http://www.computercraft.info/forums2/index.php?/topic/8169-sha-256-in-pure-lua/ + +-- +-- Adaptation of the Secure Hashing Algorithm (SHA-244/256) +-- Found Here: http://lua-users.org/wiki/SecureHashAlgorithm +-- +-- Using an adapted version of the bit library +-- Found Here: https://bitbucket.org/Boolsheet/bslf/src/1ee664885805/bit.lua +-- + +local MOD = 2^32 +local MODM = MOD-1 + +local function memoize(f) + local mt = {} + local t = setmetatable({}, mt) + function mt:__index(k) + local v = f(k) + t[k] = v + return v + end + return t +end + +local function make_bitop_uncached(t, m) + local function bitop(a, b) + local res,p = 0,1 + while a ~= 0 and b ~= 0 do + local am, bm = a % m, b % m + res = res + t[am][bm] * p + a = (a - am) / m + b = (b - bm) / m + p = p*m + end + res = res + (a + b) * p + return res + end + return bitop +end + +local function make_bitop(t) + local op1 = make_bitop_uncached(t,2^1) + local op2 = memoize(function(a) return memoize(function(b) return op1(a, b) end) end) + return make_bitop_uncached(op2, 2 ^ (t.n or 1)) +end + +local bxor1 = make_bitop({[0] = {[0] = 0,[1] = 1}, [1] = {[0] = 1, [1] = 0}, n = 4}) + +local function bxor(a, b, c, ...) + local z = nil + if b then + a = a % MOD + b = b % MOD + z = bxor1(a, b) + if c then z = bxor(z, c, ...) end + return z + elseif a then return a % MOD + else return 0 end +end + +local function band(a, b, c, ...) + local z + if b then + a = a % MOD + b = b % MOD + z = ((a + b) - bxor1(a,b)) / 2 + if c then z = bit32_band(z, c, ...) end + return z + elseif a then return a % MOD + else return MODM end +end + +local function bnot(x) return (-1 - x) % MOD end + +local function rshift1(a, disp) + if disp < 0 then return lshift(a,-disp) end + return math.floor(a % 2 ^ 32 / 2 ^ disp) +end + +local function rshift(x, disp) + if disp > 31 or disp < -31 then return 0 end + return rshift1(x % MOD, disp) +end + +local function lshift(a, disp) + if disp < 0 then return rshift(a,-disp) end + return (a * 2 ^ disp) % 2 ^ 32 +end + +local function rrotate(x, disp) + x = x % MOD + disp = disp % 32 + local low = band(x, 2 ^ disp - 1) + return rshift(x, disp) + lshift(low, 32 - disp) +end + +local k = { + 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, + 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, + 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, + 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, + 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, + 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, + 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, + 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, + 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, + 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, + 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, + 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, + 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, + 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, + 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, + 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2, +} + +local function str2hexa(s) + return (string.gsub(s, ".", function(c) return string.format("%02x", string.byte(c)) end)) +end + +local function num2s(l, n) + local s = "" + for i = 1, n do + local rem = l % 256 + s = string.char(rem) .. s + l = (l - rem) / 256 + end + return s +end + +local function s232num(s, i) + local n = 0 + for i = i, i + 3 do n = n*256 + string.byte(s, i) end + return n +end + +local function preproc(msg, len) + local extra = 64 - ((len + 9) % 64) + len = num2s(8 * len, 8) + msg = msg .. "\128" .. string.rep("\0", extra) .. len + assert(#msg % 64 == 0) + return msg +end + +local function initH256(H) + H[1] = 0x6a09e667 + H[2] = 0xbb67ae85 + H[3] = 0x3c6ef372 + H[4] = 0xa54ff53a + H[5] = 0x510e527f + H[6] = 0x9b05688c + H[7] = 0x1f83d9ab + H[8] = 0x5be0cd19 + return H +end + +local function digestblock(msg, i, H) + local w = {} + for j = 1, 16 do w[j] = s232num(msg, i + (j - 1)*4) end + for j = 17, 64 do + local v = w[j - 15] + local s0 = bxor(rrotate(v, 7), rrotate(v, 18), rshift(v, 3)) + v = w[j - 2] + w[j] = w[j - 16] + s0 + w[j - 7] + bxor(rrotate(v, 17), rrotate(v, 19), rshift(v, 10)) + end + + local a, b, c, d, e, f, g, h = H[1], H[2], H[3], H[4], H[5], H[6], H[7], H[8] + for i = 1, 64 do + local s0 = bxor(rrotate(a, 2), rrotate(a, 13), rrotate(a, 22)) + local maj = bxor(band(a, b), band(a, c), band(b, c)) + local t2 = s0 + maj + local s1 = bxor(rrotate(e, 6), rrotate(e, 11), rrotate(e, 25)) + local ch = bxor (band(e, f), band(bnot(e), g)) + local t1 = h + s1 + ch + k[i] + w[i] + h, g, f, e, d, c, b, a = g, f, e, d + t1, c, b, a, t1 + t2 + end + + H[1] = band(H[1] + a) + H[2] = band(H[2] + b) + H[3] = band(H[3] + c) + H[4] = band(H[4] + d) + H[5] = band(H[5] + e) + H[6] = band(H[6] + f) + H[7] = band(H[7] + g) + H[8] = band(H[8] + h) +end + +-- Made this global +function sha256(msg) + msg = preproc(msg, #msg) + local H = initH256({}) + for i = 1, #msg, 64 do digestblock(msg, i, H) end + return str2hexa(num2s(H[1], 4) .. num2s(H[2], 4) .. num2s(H[3], 4) .. num2s(H[4], 4) .. + num2s(H[5], 4) .. num2s(H[6], 4) .. num2s(H[7], 4) .. num2s(H[8], 4)) +end \ No newline at end of file diff --git a/system/boot.lua b/system/boot.lua index c25fae2..fd143c7 100644 --- a/system/boot.lua +++ b/system/boot.lua @@ -64,9 +64,9 @@ else config:close() term.setTextColor(colors.blue) print("[INFO] Config has not been found!") - print("[INFO] You will be sent to the OOBE setup...") + print("[INFO] You will be sent to the post installation setup...") sleep(3) - shell.run("/system/setup.lua") + shell.run("/system/post-setup.lua") end sleep(3) diff --git a/system/post-setup.lua b/system/post-setup.lua new file mode 100644 index 0000000..4eb3712 --- /dev/null +++ b/system/post-setup.lua @@ -0,0 +1,33 @@ +--[[ + bits-UI Setup: Post installation setup for bits-UI + Copyright (C) 2019 Alee14 + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. +]]-- + +term.clear() +term.setCursorPos(1,1) +term.setTextColor(colors.white) + +if fs.exists("/system/skel/README.txt") then + shell.run("copy", "/system/skel/README.txt", "/home") +else + print("[ERROR] Unable to find README.txt...") +end + +fs.makeDir("/home/Documents") +fs.makeDir("/home/Downloads") +fs.makeDir("/home/Pictures") + +print("Welcome to the setup!") + +sleep(3) +shell.run("/system/desktop.lua") \ No newline at end of file diff --git a/system/setup.lua b/system/setup.lua deleted file mode 100644 index f3b76d1..0000000 --- a/system/setup.lua +++ /dev/null @@ -1,29 +0,0 @@ ---[[ - bits-UI Setup: After installation setup for bits-UI - Copyright (C) 2019 Alee14 - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -]]-- - -term.clear() -term.setCursorPos(1,1) -term.setTextColor(colors.white) - -if fs.exists("/system/skel/README.txt") then - shell.run("copy", "/system/skel/README.txt", "/home") -else - print("[ERROR] Unable to find README.txt...") -end - -print("Welcome to the setup!") - -sleep(3) -shell.run("/system/desktop.lua") \ No newline at end of file -- cgit v1.2.3