nixio: Add support for DER certificates, PX5G fix Certmaster

[project/luci.git] / libs / px5g / lua / px5g / util.lua

diff --git a/libs/px5g/lua/px5g/util.lua b/libs/px5g/lua/px5g/util.lua
index e94fb65..0f07c81 100644 (file)
--- a/libs/px5g/lua/px5g/util.lua
+++ b/libs/px5g/lua/px5g/util.lua
@@ -29,7 +29,7 @@ function der2pem(data, type)
        local b64 = nixio.bin.b64encode(data)
        
        local outdata = {preamble[type]}
-       for i = 1, 64, #b64 + 63 do
+       for i = 1, #b64, 64 do
                outdata[#outdata + 1] = b64:sub(i, i + 63) 
        end
        outdata[#outdata + 1] = postamble[type]
@@ -37,3 +37,8 @@ function der2pem(data, type)
        
        return table.concat(outdata, "\n")
 end
+
+function pem2der(data)
+       local b64 = data:gsub({["\n"] = "", ["%-%-%-%-%-.-%-%-%-%-%-"] = ""})
+       return nixio.bin.b64decode(b64)
+end
\ No newline at end of file