Changeset 4763

Timestamp:

06/07/09 11:15:12 (4 years ago)

Author:

Cyrus

Message:

nixio: Add support for DER certificates, PX5G fix Certmaster

Location:

luci/trunk/libs

Files:

• nixio/root (added)
• nixio/root/etc (added)
• nixio/root/etc/nixio (added)
• nixio/root/etc/nixio/.nixio_stamp (added)
• nixio/src/tls-context.c (modified) (1 diff)
• px5g/lua/px5g/util.lua (modified) (2 diffs)
• px5g/root/usr/sbin/px5g-genkeys (modified) (1 diff)
• px5g/src/px5g.c (modified) (2 diffs)

luci/trunk/libs/nixio/src/tls-context.c

@@ -114 +114 @@
     SSL_CTX *ctx = nixio__checktlsctx(L);
     const char *cert = luaL_checkstring(L, 2);
-    return nixio__tls_pstatus(L, SSL_CTX_use_certificate_chain_file(ctx, cert));
+    const char *type = luaL_optstring(L, 3, "chain");
+    int ktype;
+
+    if (!strcmp(type, "chain")) {
+        return nixio__tls_pstatus(L,
+                SSL_CTX_use_certificate_chain_file(ctx, cert));
+    } else if (!strcmp(type, "pem")) {
+        ktype = SSL_FILETYPE_PEM;
+    } else if (!strcmp(type, "asn1")) {
+        ktype = SSL_FILETYPE_ASN1;
+    } else {
+        return luaL_argerror(L, 3, "supported values: chain, pem, asn1");
+    }
+
+    return nixio__tls_pstatus(L,
+            SSL_CTX_use_certificate_file(ctx, cert, ktype));
 }
 

luci/trunk/libs/px5g/lua/px5g/util.lua

@@ -30 +30 @@
     
     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
@@ -38 +38 @@
     return table.concat(outdata, "\n")
 end
+
+function pem2der(data)
+    local b64 = data:gsub({["\n"] = "", ["%-%-%-%-%-.-%-%-%-%-%-"] = ""})
+    return nixio.bin.b64decode(b64)
+end

luci/trunk/libs/px5g/root/usr/sbin/px5g-genkeys

@@ -7 +7 @@
 local fs = require "nixio.fs"
 local os = require "os"
+nixio.umask(77)
 
 if not fs.access(certfile) then

luci/trunk/libs/px5g/src/px5g.c

@@ -86 +86 @@
     4, "Invalid Time");
 
+    size_t join = 1;
     lua_pushliteral(L, "");
     for (int i = 0; i < (sizeof(xfields) / sizeof(*xfields)); i++) {
@@ -92 +93 @@
         if (lua_isstring(L, -1)) {
             const char *val = lua_tostring(L, -1);
-            luaL_argcheck(L, !strchr(val, '\''), 2, "Invalid Value");
-            lua_pushfstring(L, "%s%s='%s';",
-                lua_tostring(L, -2), xfields[i], val);
+            luaL_argcheck(L, !strchr(val, ';'), 2, "Invalid Value");
+            lua_pushfstring(L, "%s=%s;", xfields[i], val);
             lua_remove(L, -2);
-            lua_remove(L, -2);
+            join++;
         } else {
             lua_pop(L, 1);
         }
     }
+    lua_concat(L, join);
 
     x509_raw cert;