From ab02eadc12639d351a877dbb2fd1efdd7c8f3cd0 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 24 Apr 2014 23:38:47 +0200 Subject: util.x509: And functions for converting between DER and PEM --- util/x509.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/util/x509.lua b/util/x509.lua index 857f02a4..1a4f5f38 100644 --- a/util/x509.lua +++ b/util/x509.lua @@ -20,6 +20,7 @@ local nameprep = require "util.encodings".stringprep.nameprep; local idna_to_ascii = require "util.encodings".idna.to_ascii; +local base64 = require "util.encodings".base64; local log = require "util.logger".init("x509"); local pairs, ipairs = pairs, ipairs; local s_format = string.format; @@ -214,4 +215,23 @@ function verify_identity(host, service, cert) return false end +local pat = "%-%-%-%-%-BEGIN ([A-Z ]+)%-%-%-%-%-\r?\n".. +"([0-9A-Za-z+/=\r\n]*)\r?\n%-%-%-%-%-END %1%-%-%-%-%-"; + +function pem2der(pem) + local typ, data = pem:match(pat); + if typ and data then + return base64.decode(data), typ; + end +end + +local wrap = ('.'):rep(64); +local envelope = "-----BEGIN %s-----\n%s\n-----END %s-----\n" + +function der2pem(data, typ) + typ = typ and typ:upper() or "CERTIFICATE"; + data = base64.encode(data); + return s_format(envelope, typ, data:gsub(wrap, '%0\n', (#data-1)/64), typ); +end + return _M; -- cgit v1.2.3 From c62c48c5e324f3e1417e38dc40d7a3ca1cd913c3 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 25 Apr 2014 00:36:01 +0200 Subject: util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (thanks pro) --- util-src/pposix.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util-src/pposix.c b/util-src/pposix.c index 4fb1fb56..a8654995 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -664,6 +664,7 @@ int lc_meminfo(lua_State* L) #if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L || defined(_GNU_SOURCE) int lc_fallocate(lua_State* L) { + int ret; off_t offset, len; FILE *f = *(FILE**) luaL_checkudata(L, 1, LUA_FILEHANDLE); if (f == NULL) @@ -691,7 +692,8 @@ int lc_fallocate(lua_State* L) #warning Note that posix_fallocate() will still be used on filesystems that dont support fallocate() #endif - if(posix_fallocate(fileno(f), offset, len) == 0) + ret = posix_fallocate(fileno(f), offset, len); + if(ret == 0) { lua_pushboolean(L, 1); return 1; @@ -699,7 +701,7 @@ int lc_fallocate(lua_State* L) else { lua_pushnil(L); - lua_pushstring(L, strerror(errno)); + lua_pushstring(L, strerror(ret)); /* posix_fallocate() can leave a bunch of NULs at the end, so we cut that * this assumes that offset == length of the file */ ftruncate(fileno(f), offset); -- cgit v1.2.3 From eb66dffc2645967e922c17b1db559409ccc71d88 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 25 Apr 2014 02:41:55 +0200 Subject: util.pposix: Fix error reporting from really old Linux fallocate() that did not use errno for some reason (thanks pro) --- util-src/pposix.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util-src/pposix.c b/util-src/pposix.c index a8654995..df814c28 100644 --- a/util-src/pposix.c +++ b/util-src/pposix.c @@ -674,11 +674,15 @@ int lc_fallocate(lua_State* L) len = luaL_checkinteger(L, 3); #if defined(__linux__) && defined(_GNU_SOURCE) - if(fallocate(fileno(f), FALLOC_FL_KEEP_SIZE, offset, len) == 0) + errno = 0; + ret = fallocate(fileno(f), FALLOC_FL_KEEP_SIZE, offset, len); + if(ret == 0) { lua_pushboolean(L, 1); return 1; } + /* Some old versions of Linux apparently use the return value instead of errno */ + if(errno == 0) errno = ret; if(errno != ENOSYS && errno != EOPNOTSUPP) { -- cgit v1.2.3 From 99e2e845ecb34568ce762a27c1c5d52c6f086525 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 25 Apr 2014 02:47:09 +0200 Subject: util.x509: Remove unused imports --- util/x509.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/util/x509.lua b/util/x509.lua index 1a4f5f38..5e1b49e5 100644 --- a/util/x509.lua +++ b/util/x509.lua @@ -22,10 +22,7 @@ local nameprep = require "util.encodings".stringprep.nameprep; local idna_to_ascii = require "util.encodings".idna.to_ascii; local base64 = require "util.encodings".base64; local log = require "util.logger".init("x509"); -local pairs, ipairs = pairs, ipairs; local s_format = string.format; -local t_insert = table.insert; -local t_concat = table.concat; module "x509" -- cgit v1.2.3