From 41485b40ab1d4eb1a49047bc3274a0e604e76c88 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 20 Jan 2017 11:41:07 +0100 Subject: util.crand: Switch to luaL_checkinteger since checkint is deprecated in Lua 5.3 --- util-src/crand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util-src') diff --git a/util-src/crand.c b/util-src/crand.c index 177511ce..547ceb55 100644 --- a/util-src/crand.c +++ b/util-src/crand.c @@ -57,7 +57,7 @@ int Lrandom(lua_State *L) { unsigned char *buf; #endif int ret = 0; - size_t len = (size_t)luaL_checkint(L, 1); + size_t len = (size_t)luaL_checkinteger(L, 1); #ifdef BUFLEN len = len > BUFLEN ? BUFLEN : len; #else @@ -71,6 +71,7 @@ int Lrandom(lua_State *L) { */ return 2; } + #endif #if defined(WITH_GETRANDOM) -- cgit v1.2.3 From a59ab44459bfd79feb1f74ac1ba9cdd891e5946f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 20 Jan 2017 11:52:46 +0100 Subject: util.crand: Let Lua handle allocation, freeing and error handling for buffer --- util-src/crand.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) (limited to 'util-src') diff --git a/util-src/crand.c b/util-src/crand.c index 547ceb55..21079be0 100644 --- a/util-src/crand.c +++ b/util-src/crand.c @@ -19,15 +19,6 @@ #include #include -/* - * TODO: Decide on fixed size or dynamically allocated buffer - */ -#if 1 -#include -#else -#define BUFLEN 256 -#endif - #if defined(WITH_GETRANDOM) #include #include @@ -38,7 +29,7 @@ #endif /* Was this not supposed to be a function? */ -int getrandom(char *buf, size_t len, int flags) { +int getrandom(void *buf, size_t len, int flags) { return syscall(SYS_getrandom, buf, len, flags); } @@ -51,36 +42,14 @@ int getrandom(char *buf, size_t len, int flags) { #endif int Lrandom(lua_State *L) { -#ifdef BUFLEN - unsigned char buf[BUFLEN]; -#else - unsigned char *buf; -#endif int ret = 0; size_t len = (size_t)luaL_checkinteger(L, 1); -#ifdef BUFLEN - len = len > BUFLEN ? BUFLEN : len; -#else - buf = malloc(len); - - if(buf == NULL) { - lua_pushnil(L); - lua_pushstring(L, "out of memory"); - /* or it migth be better to - * return lua_error(L); - */ - return 2; - } - -#endif + void *buf = lua_newuserdata(L, len); #if defined(WITH_GETRANDOM) ret = getrandom(buf, len, 0); if(ret < 0) { -#ifndef BUFLEN - free(buf); -#endif lua_pushnil(L); lua_pushstring(L, strerror(errno)); lua_pushinteger(L, errno); @@ -96,9 +65,6 @@ int Lrandom(lua_State *L) { if(ret == 1) { ret = len; } else { -#ifndef BUFLEN - free(buf); -#endif lua_pushnil(L); lua_pushstring(L, "failed"); /* lua_pushinteger(L, ERR_get_error()); */ @@ -107,10 +73,7 @@ int Lrandom(lua_State *L) { #endif - lua_pushlstring(L, (const char *)buf, ret); -#ifndef BUFLEN - free(buf); -#endif + lua_pushlstring(L, buf, ret); return 1; } -- cgit v1.2.3 From 8e052e0857a2b62c33271334470ff529f9b76a85 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 20 Jan 2017 11:33:31 +0100 Subject: util.crand: Remove seeding --- util-src/crand.c | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'util-src') diff --git a/util-src/crand.c b/util-src/crand.c index 21079be0..6b9dc726 100644 --- a/util-src/crand.c +++ b/util-src/crand.c @@ -77,22 +77,6 @@ int Lrandom(lua_State *L) { return 1; } -#ifdef ENABLE_SEEDING -int Lseed(lua_State *L) { - size_t len; - const char *seed = lua_tolstring(L, 1, &len); - -#if defined(WITH_OPENSSL) - RAND_add(seed, len, len); - return 0; -#else - lua_pushnil(L); - lua_pushliteral(L, "not-supported"); - return 2; -#endif -} -#endif - int luaopen_util_crand(lua_State *L) { #if (LUA_VERSION_NUM > 501) luaL_checkversion(L); @@ -100,10 +84,6 @@ int luaopen_util_crand(lua_State *L) { lua_newtable(L); lua_pushcfunction(L, Lrandom); lua_setfield(L, -2, "bytes"); -#ifdef ENABLE_SEEDING - lua_pushcfunction(L, Lseed); - lua_setfield(L, -2, "seed"); -#endif #if defined(WITH_GETRANDOM) lua_pushstring(L, "Linux"); -- cgit v1.2.3 From 13f287acb9eb066e95bcbd0faf1db07f5aca953d Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 20 Jan 2017 12:23:55 +0100 Subject: util.crand: Raise hard errors --- util-src/crand.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'util-src') diff --git a/util-src/crand.c b/util-src/crand.c index 6b9dc726..ab16d8d8 100644 --- a/util-src/crand.c +++ b/util-src/crand.c @@ -50,10 +50,8 @@ int Lrandom(lua_State *L) { ret = getrandom(buf, len, 0); if(ret < 0) { - lua_pushnil(L); lua_pushstring(L, strerror(errno)); - lua_pushinteger(L, errno); - return 3; + return lua_error(L); } #elif defined(WITH_ARC4RANDOM) @@ -65,10 +63,8 @@ int Lrandom(lua_State *L) { if(ret == 1) { ret = len; } else { - lua_pushnil(L); - lua_pushstring(L, "failed"); - /* lua_pushinteger(L, ERR_get_error()); */ - return 2; + lua_pushstring(L, "RAND_bytes() failed"); + return lua_error(L); } #endif -- cgit v1.2.3 From 26d03a9a1af39684490dcc02b36f092db92cb4cc Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 22 Jan 2017 04:05:41 +0100 Subject: util.ringbuffer: Remove unused macros --- util-src/ringbuffer.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'util-src') diff --git a/util-src/ringbuffer.c b/util-src/ringbuffer.c index d60a43d9..950bda2b 100644 --- a/util-src/ringbuffer.c +++ b/util-src/ringbuffer.c @@ -8,9 +8,6 @@ #include #include -#define MIN(a, b) ((a)>(b)?(b):(a)) -#define MAX(a, b) ((a)>(b)?(a):(b)) - typedef struct { size_t rpos; /* read position */ size_t wpos; /* write position */ -- cgit v1.2.3 From c8e4e17b468657f997ad03e0baa91f205b71213c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 22 Jan 2017 09:23:10 +0100 Subject: util.ringbuffer: Allocate buffer itself as part of userdata (simpler, single allocation, no need for __gc) --- util-src/ringbuffer.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'util-src') diff --git a/util-src/ringbuffer.c b/util-src/ringbuffer.c index 950bda2b..f7487a88 100644 --- a/util-src/ringbuffer.c +++ b/util-src/ringbuffer.c @@ -13,7 +13,7 @@ typedef struct { size_t wpos; /* write position */ size_t alen; /* allocated size */ size_t blen; /* current content size */ - char* buffer; + char buffer[]; } ringbuffer; char readchar(ringbuffer* b) { @@ -166,16 +166,12 @@ int rb_free(lua_State* L) { int rb_new(lua_State* L) { size_t size = luaL_optinteger(L, 1, sysconf(_SC_PAGESIZE)); - ringbuffer* b = lua_newuserdata(L, sizeof(ringbuffer)); + ringbuffer *b = lua_newuserdata(L, sizeof(ringbuffer) + size); + b->rpos = 0; b->wpos = 0; b->alen = size; b->blen = 0; - b->buffer = malloc(size); - - if(b->buffer == NULL) { - return 0; - } luaL_getmetatable(L, "ringbuffer_mt"); lua_setmetatable(L, -2); @@ -183,16 +179,6 @@ int rb_new(lua_State* L) { return 1; } -int rb_gc(lua_State* L) { - ringbuffer* b = luaL_checkudata(L, 1, "ringbuffer_mt"); - - if(b->buffer != NULL) { - free(b->buffer); - } - - return 0; -} - int luaopen_util_ringbuffer(lua_State* L) { #if (LUA_VERSION_NUM > 501) luaL_checkversion(L); @@ -202,8 +188,6 @@ int luaopen_util_ringbuffer(lua_State* L) { lua_setfield(L, -2, "__tostring"); lua_pushcfunction(L, rb_length); lua_setfield(L, -2, "__len"); - lua_pushcfunction(L, rb_gc); - lua_setfield(L, -2, "__gc"); lua_newtable(L); /* __index */ { -- cgit v1.2.3 From 7b85ad2d53e7cc30844a38f9f7844fedc0237a88 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 22 Jan 2017 09:31:56 +0100 Subject: util.crand: Update copyright header --- util-src/crand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'util-src') diff --git a/util-src/crand.c b/util-src/crand.c index ab16d8d8..da79f3c7 100644 --- a/util-src/crand.c +++ b/util-src/crand.c @@ -1,7 +1,7 @@ /* Prosody IM --- Copyright (C) 2008-2016 Matthew Wild --- Copyright (C) 2008-2016 Waqas Hussain --- Copyright (C) 2016 Kim Alvefur +-- Copyright (C) 2008-2017 Matthew Wild +-- Copyright (C) 2008-2017 Waqas Hussain +-- Copyright (C) 2016-2017 Kim Alvefur -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- cgit v1.2.3 From d5a53255260e621fa6cbd3b3277aa12b41486e0f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 22 Jan 2017 09:32:33 +0100 Subject: util.crand: Add comment describing purpose of module --- util-src/crand.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'util-src') diff --git a/util-src/crand.c b/util-src/crand.c index da79f3c7..aa3379c2 100644 --- a/util-src/crand.c +++ b/util-src/crand.c @@ -11,6 +11,12 @@ /* * crand.c * C PRNG interface +* +* The purpose of this module is to provide access to a PRNG in +* environments without /dev/urandom +* +* Caution! This has not been extensively tested. +* */ #include "lualib.h" -- cgit v1.2.3 From 2b7fcfdb1365400e634dc4d41a4bcdc1eb29c4d8 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 22 Jan 2017 09:55:44 +0100 Subject: util.crand: Comment about getrandom --- util-src/crand.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'util-src') diff --git a/util-src/crand.c b/util-src/crand.c index aa3379c2..7dd71a92 100644 --- a/util-src/crand.c +++ b/util-src/crand.c @@ -34,7 +34,10 @@ #error getrandom() requires Linux 3.17 or later #endif -/* Was this not supposed to be a function? */ +/* + * This acts like a read from /dev/urandom with the exception that it + * *does* block if the entropy pool is not yet initialized. + */ int getrandom(void *buf, size_t len, int flags) { return syscall(SYS_getrandom, buf, len, flags); } -- cgit v1.2.3 From 8bcfc383748488c26c854a034db42c9e31674823 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 22 Jan 2017 09:55:52 +0100 Subject: util.crand: TODOs --- util-src/crand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util-src') diff --git a/util-src/crand.c b/util-src/crand.c index 7dd71a92..cc2047eb 100644 --- a/util-src/crand.c +++ b/util-src/crand.c @@ -72,6 +72,7 @@ int Lrandom(lua_State *L) { if(ret == 1) { ret = len; } else { + /* TODO ERR_get_error() */ lua_pushstring(L, "RAND_bytes() failed"); return lua_error(L); } @@ -100,7 +101,7 @@ int luaopen_util_crand(lua_State *L) { lua_setfield(L, -2, "_source"); #if defined(WITH_OPENSSL) && defined(_WIN32) - /* Do we need to seed this on Windows? */ + /* TODO Do we need to seed this on Windows? */ #endif return 1; -- cgit v1.2.3 From 0d28378a7ac1410c4d32b7e0415fdc646ce2a755 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 23 Jan 2017 18:33:35 +0100 Subject: util-src/*.c: Squeeze repeated blank lines --- util-src/encodings.c | 1 - util-src/hashes.c | 1 - util-src/pposix.c | 2 -- util-src/ringbuffer.c | 3 --- util-src/table.c | 1 - 5 files changed, 8 deletions(-) (limited to 'util-src') diff --git a/util-src/encodings.c b/util-src/encodings.c index 6389b2be..4d6ac437 100644 --- a/util-src/encodings.c +++ b/util-src/encodings.c @@ -251,7 +251,6 @@ static const luaL_Reg Reg_utf8[] = { { NULL, NULL } }; - /***************** STRINGPREP *****************/ #ifdef USE_STRINGPREP_ICU diff --git a/util-src/hashes.c b/util-src/hashes.c index d6f848c7..697c632f 100644 --- a/util-src/hashes.c +++ b/util-src/hashes.c @@ -7,7 +7,6 @@ -- */ - /* * hashes.c * Lua library for sha1, sha256 and md5 hashes diff --git a/util-src/pposix.c b/util-src/pposix.c index 39d8742b..b6874318 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -595,8 +595,6 @@ int lc_getrlimit(lua_State* L) { return 2; } - - resource = luaL_checkstring(L, 1); rid = string2resource(resource); diff --git a/util-src/ringbuffer.c b/util-src/ringbuffer.c index f7487a88..73a8616b 100644 --- a/util-src/ringbuffer.c +++ b/util-src/ringbuffer.c @@ -1,5 +1,4 @@ - #include #include #include @@ -73,7 +72,6 @@ int rb_find(lua_State* L) { return 0; } - int rb_read(lua_State* L) { ringbuffer* b = luaL_checkudata(L, 1, "ringbuffer_mt"); int r = luaL_checkinteger(L, 2); @@ -101,7 +99,6 @@ int rb_read(lua_State* L) { return 1; } - int rb_readuntil(lua_State* L) { size_t l, m; ringbuffer* b = luaL_checkudata(L, 1, "ringbuffer_mt"); diff --git a/util-src/table.c b/util-src/table.c index 93acae65..c9c09170 100644 --- a/util-src/table.c +++ b/util-src/table.c @@ -19,7 +19,6 @@ static int Lpack(lua_State* L) { return 1; } - int luaopen_util_table(lua_State* L) { #if (LUA_VERSION_NUM > 501) luaL_checkversion(L); -- cgit v1.2.3