MayaTheShy/Opus
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

crypto cleanup

Browse Source
This commit is contained in:
kepler155c@gmail.com
2019-06-28 06:33:47 -04:00
parent bcd33af599
commit c3d52c1aab
10 changed files with 35 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sys/apps/Overview.lua
View File

@@ -3,7 +3,7 @@ local Config = require('config')
local Event = require('event')
local NFT = require('nft')
local Packages = require('packages')
local SHA1 = require('sha1')
local SHA = require('crypto.sha2')
local Tween = require('ui.tween')
local UI = require('ui')
local Util = require('util')
@@ -502,7 +502,7 @@ end
function page.editor:updateApplications(app)
if not app.key then
app.key = SHA1.sha1(app.title)
app.key = SHA.compute(app.title)
end
local filename = app.filename or fs.combine(REGISTRY_DIR, app.key)
Util.writeTable(filename, app)
@@ -571,7 +571,7 @@ end
Event.on('overview_shortcut', function(_, app)
if not app.key then
app.key = SHA1.sha1(app.title)
app.key = SHA.compute(app.title)
end
local filename = app.filename or fs.combine(REGISTRY_DIR, app.key)
if not fs.exists(filename) then

4
sys/apps/Welcome.lua
View File

@@ -1,6 +1,6 @@
local Ansi = require('ansi')
local Security = require('security')
local SHA2 = require('crypto.sha2')
local SHA = require('crypto.sha2')
local UI = require('ui')
local colors = _G.colors
@@ -107,7 +107,7 @@ end
function page.wizard.pages.password:validate()
if #self.newPass.value > 0 then
Security.updatePassword(SHA2.digest(self.newPass.value):toHex())
Security.updatePassword(SHA.compute(self.newPass.value))
end
--[[
if #self.group.value > 0 then

4
sys/apps/password.lua
View File

@@ -1,10 +1,10 @@
local Security = require('security')
local SHA2 = require('crypto.sha2')
local SHA = require('crypto.sha2')
local Terminal = require('terminal')
local password = Terminal.readPassword('Enter new password: ')
if password then
Security.updatePassword(SHA2.digest(password):toHex())
Security.updatePassword(SHA.compute(password))
print('Password updated')
end

6
sys/apps/system/password.lua
View File

@@ -1,5 +1,5 @@
local Security = require('security')
local SHA2 = require('crypto.sha2')
local SHA = require('crypto.sha2')
local UI = require('ui')
local colors = _G.colors
@@ -40,11 +40,11 @@ function passwordTab:eventHandler(event)
if #self.newPass.value == 0 then
self:emit({ type = 'error_message', message = 'Invalid password' })
elseif Security.getPassword() and not Security.verifyPassword(SHA2.digest(self.oldPass.value):toHex()) then
elseif Security.getPassword() and not Security.verifyPassword(SHA.compute(self.oldPass.value)) then
self:emit({ type = 'error_message', message = 'Passwords do not match' })
else
Security.updatePassword(SHA2.digest(self.newPass.value):toHex())
Security.updatePassword(SHA.compute(self.newPass.value))
self.oldPass.inactive = false
self:emit({ type = 'success_message', message = 'Password updated' })
end

4
sys/apps/trust.lua
View File

@@ -1,6 +1,6 @@
local Crypto = require('crypto.chacha20')
local Security = require('security')
local SHA2 = require('crypto.sha2')
local SHA = require('crypto.sha2')
local Socket = require('socket')
local Terminal = require('terminal')
@@ -35,7 +35,7 @@ end
local publicKey = Security.getPublicKey()
socket:write(Crypto.encrypt({ pk = publicKey, dh = os.getComputerID() }, SHA2.digest(password):toHex()))
socket:write(Crypto.encrypt({ pk = publicKey, dh = os.getComputerID() }, SHA.compute(password)))
local data = socket:read(2)
socket:close()