aboutsummaryrefslogtreecommitdiffstats
path: root/util-src/hashes.c
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-18 02:22:48 +0200
committerKim Alvefur <zash@zash.se>2014-09-18 02:22:48 +0200
commit31be1596b93612e1c848402bd21207ad06ae30e8 (patch)
tree361f642064745fd1a6601050e7573062ff65e2ad /util-src/hashes.c
parent57b543c70405092fc24f859c05c734fc8b361030 (diff)
parentb19f5a09a19534973d522e7400139f040d76391b (diff)
downloadprosody-31be1596b93612e1c848402bd21207ad06ae30e8.tar.gz
prosody-31be1596b93612e1c848402bd21207ad06ae30e8.zip
Merge 0.10->trunk
Diffstat (limited to 'util-src/hashes.c')
-rw-r--r--util-src/hashes.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/util-src/hashes.c b/util-src/hashes.c
index 33041e83..459f75ac 100644
--- a/util-src/hashes.c
+++ b/util-src/hashes.c
@@ -27,6 +27,10 @@ typedef unsigned __int32 uint32_t;
#include <openssl/sha.h>
#include <openssl/md5.h>
+#if (LUA_VERSION_NUM == 502)
+#define luaL_register(L, N, R) luaL_setfuncs(L, R, 0)
+#endif
+
#define HMAC_IPAD 0x36363636
#define HMAC_OPAD 0x5c5c5c5c
@@ -203,9 +207,9 @@ static const luaL_Reg Reg[] =
LUALIB_API int luaopen_util_hashes(lua_State *L)
{
- luaL_register(L, "hashes", Reg);
- lua_pushliteral(L, "version"); /** version */
+ lua_newtable(L);
+ luaL_register(L, NULL, Reg);
lua_pushliteral(L, "-3.14");
- lua_settable(L,-3);
+ lua_setfield(L, -2, "version");
return 1;
}