equal
deleted
inserted
replaced
50 local has_luasec, luasec = pcall ( require , "ssl" ) |
50 local has_luasec, luasec = pcall ( require , "ssl" ) |
51 local luasocket = use "socket" or require "socket" |
51 local luasocket = use "socket" or require "socket" |
52 local luasocket_gettime = luasocket.gettime |
52 local luasocket_gettime = luasocket.gettime |
53 local inet = require "util.net"; |
53 local inet = require "util.net"; |
54 local inet_pton = inet.pton; |
54 local inet_pton = inet.pton; |
|
55 local sslconfig = require "util.sslconfig"; |
|
56 local tls_impl = require "net.tls_luasec"; |
55 |
57 |
56 --// extern lib methods //-- |
58 --// extern lib methods //-- |
57 |
59 |
58 local ssl_wrap = ( has_luasec and luasec.wrap ) |
60 local ssl_wrap = ( has_luasec and luasec.wrap ) |
59 local socket_bind = luasocket.bind |
61 local socket_bind = luasocket.bind |
1179 getsettings = getsettings, |
1181 getsettings = getsettings, |
1180 setquitting = setquitting, |
1182 setquitting = setquitting, |
1181 removeserver = removeserver, |
1183 removeserver = removeserver, |
1182 get_backend = get_backend, |
1184 get_backend = get_backend, |
1183 changesettings = changesettings, |
1185 changesettings = changesettings, |
|
1186 |
|
1187 tls_builder = function(basedir) |
|
1188 return sslconfig._new(tls_impl.new_context, basedir) |
|
1189 end, |
1184 } |
1190 } |