Changeset 4288

Timestamp:

03/04/09 14:09:32 (4 years ago)

Author:

Cyrus

Message:

Set /etc/private.rsa as default key for axTLS contexts
More openssl - axTLS fixes

Location:

luci/trunk/libs/nixio

Files:

• axTLS/.prepared (deleted)
• src/tls-context.c (modified) (5 diffs)

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

@@ -44 +44 @@
     const char *method = luaL_optlstring(L, 1, "tlsv1", NULL);
 
+    luaL_getmetatable(L, NIXIO_TLS_CTX_META);
     SSL_CTX **ctx = lua_newuserdata(L, sizeof(SSL_CTX *));
     if (!ctx) {
@@ -50 +51 @@
 
     /* create userdata */
-    luaL_getmetatable(L, NIXIO_TLS_CTX_META);
+    lua_pushvalue(L, -2);
     lua_setmetatable(L, -2);
+    lua_getfield(L, -1, "tls_defaultkey");
 
     if (!strcmp(method, "tlsv1")) {
@@ -61 +63 @@
     }
 
-
-    SSL_CTX_set_options(*ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-
     if (!(*ctx)) {
         return luaL_error(L, "unable to create TLS context");
     }
+
+    const char *autoload = lua_tostring(L, -1);
+    if (autoload) {
+        SSL_CTX_use_PrivateKey_file(*ctx, autoload, SSL_FILETYPE_PEM);
+    }
+    lua_pop(L, 1);
+
+    SSL_CTX_set_options(*ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
 
     return 1;
@@ -203 +210 @@
     luaL_register(L, NULL, R);
 
+#ifndef WITH_AXTLS
+    lua_pushliteral(L, "openssl");
+#else
+    lua_pushliteral(L, "axtls");
+#endif
+    lua_setfield(L, -2, "tls_provider");
+
     /* create context metatable */
     luaL_newmetatable(L, NIXIO_TLS_CTX_META);
@@ -208 +222 @@
     lua_setfield(L, -2, "__index");
     luaL_register(L, NULL, CTX_M);
-    lua_pop(L, 1);
-}
+#ifdef WITH_AXTLS
+    lua_pushliteral(L, "/etc/private.rsa");
+    lua_setfield(L, -2, "tls_defaultkey");
+#endif
+    lua_setfield(L, -2, "meta_tls_context");
+}