Skip to content

Update aeslua.lua #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjuthang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update aeslua.lua #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/aeslua.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
local _M = { _VERSION = "0.0.1" }

local private = {};
local public = {};
aeslua = public;
Expand All @@ -18,6 +20,8 @@ public.CBCMODE = 2;
public.OFBMODE = 3;
public.CFBMODE = 4;

_M.public = public

function private.pwToKey(password, keyLength)
local padLength = keyLength;
if (keyLength == public.AES192) then
Expand All @@ -27,7 +31,8 @@ function private.pwToKey(password, keyLength)
if (padLength > #password) then
local postfix = "";
for i = 1,padLength - #password do
postfix = postfix .. string.char(0);
--postfix = postfix .. string.char(0);
postfix = postfix .. "0";
end
password = password .. postfix;
else
Expand All @@ -51,7 +56,7 @@ end
--
-- mode and keyLength must be the same for encryption and decryption.
--
function public.encrypt(password, data, keyLength, mode)
function _M.encrypt(password, data, keyLength, mode)
assert(password ~= nil, "Empty password.");
assert(password ~= nil, "Empty data.");

Expand All @@ -60,7 +65,8 @@ function public.encrypt(password, data, keyLength, mode)

local key = private.pwToKey(password, keyLength);

local paddedData = util.padByteString(data);
--local paddedData = util.padByteString(data);
local paddedData = data;

if (mode == public.ECBMODE) then
return ciphermode.encryptString(key, paddedData, ciphermode.encryptECB);
Expand All @@ -87,7 +93,7 @@ end
--
-- mode and keyLength must be the same for encryption and decryption.
--
function public.decrypt(password, data, keyLength, mode)
function _M.decrypt(password, data, keyLength, mode)
local mode = mode or public.CBCMODE;
local keyLength = keyLength or public.AES128;

Expand All @@ -104,11 +110,15 @@ function public.decrypt(password, data, keyLength, mode)
plain = ciphermode.decryptString(key, data, ciphermode.decryptCFB);
end

return plain
--[[
result = util.unpadByteString(plain);

if (result == nil) then
return nil;
end

return result;
--]]
end
return _M