From 98844a67fed08f39ee86a2b1bab050a24077abca Mon Sep 17 00:00:00 2001 From: kikito Date: Mon, 9 Feb 2015 11:38:22 +0100 Subject: [PATCH] update luarocks version in travis --- .travis.yml | 2 +- md5.lua | 52 ++++++++++++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index b7e6f4b..cf1c620 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: erlang env: global: - - LUAROCKS_BASE=luarocks-2.0.13 + - LUAROCKS_BASE=luarocks-2.2.0 matrix: - LUA=lua5.1 LUA_DEV=liblua5.1-dev LUA_VER=5.1 LUA_SFX=5.1 LUA_INCDIR=/usr/include/lua5.1 - LUA=lua5.2 LUA_DEV=liblua5.2-dev LUA_VER=5.2 LUA_SFX=5.2 LUA_INCDIR=/usr/include/lua5.2 diff --git a/md5.lua b/md5.lua index 05cafc3..a68bbc3 100644 --- a/md5.lua +++ b/md5.lua @@ -1,6 +1,6 @@ local md5 = { - _VERSION = "md5.lua 0.5.0", - _DESCRIPTION = "MD5 computation in Lua (5.1)", + _VERSION = "md5.lua 1.0.0", + _DESCRIPTION = "MD5 computation in Lua (5.1-3, LuaJIT)", _URL = "https://github.com/kikito/md5.lua", _LICENSE = [[ MIT LICENSE @@ -48,20 +48,20 @@ else error("trying to use bitwise operation on non-integer!") end end - + local function tbl2number(tbl) local n = #tbl - + local rslt = 0 local power = 1 for i = 1, n do rslt = rslt + tbl[i]*power power = power*2 end - + return rslt end - + local function expand(tbl_m, tbl_n) local big = {} local small = {} @@ -76,11 +76,11 @@ else for i = #small + 1, #big do small[i] = 0 end - + end - + local to_bits -- needs to be declared before bit_not - + function bit_not(n) local tbl = to_bits(n) local size = max(#tbl, 32) @@ -93,7 +93,7 @@ else end return tbl2number(tbl) end - + -- defined as local above to_bits = function (n) check_int(n) @@ -114,15 +114,15 @@ else n = (n-last)/2 cnt = cnt + 1 end - + return tbl end - + function bit_or(m, n) local tbl_m = to_bits(m) local tbl_n = to_bits(n) expand(tbl_m, tbl_n) - + local tbl = {} local rslt = max(#tbl_m, #tbl_n) for i = 1, rslt do @@ -132,15 +132,15 @@ else tbl[i] = 1 end end - + return tbl2number(tbl) end - + function bit_and(m, n) local tbl_m = to_bits(m) local tbl_n = to_bits(n) expand(tbl_m, tbl_n) - + local tbl = {} local rslt = max(#tbl_m, #tbl_n) for i = 1, rslt do @@ -150,15 +150,15 @@ else tbl[i] = 1 end end - + return tbl2number(tbl) end - + function bit_xor(m, n) local tbl_m = to_bits(m) local tbl_n = to_bits(n) expand(tbl_m, tbl_n) - + local tbl = {} local rslt = max(#tbl_m, #tbl_n) for i = 1, rslt do @@ -168,35 +168,35 @@ else tbl[i] = 0 end end - + return tbl2number(tbl) end - + function bit_rshift(n, bits) check_int(n) - + local high_bit = 0 if(n < 0) then -- negative n = bit_not(abs(n)) + 1 high_bit = 2147483648 -- 0x80000000 end - + for i=1, bits do n = n/2 n = bit_or(floor(n), high_bit) end return floor(n) end - + function bit_lshift(n, bits) check_int(n) - + if(n < 0) then -- negative n = bit_not(abs(n)) + 1 end - + for i=1, bits do n = n*2 end