Skip to content

Commit 0e5446e

Browse files
chronolawdndx
authored andcommitted
dont use idx to store cert/pkey
1 parent 6862572 commit 0e5446e

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

lib/resty/core/socket/tcp.lua

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ void ngx_http_lua_ffi_ssl_free_session(void *sess);
3939
]]
4040

4141

42-
local SOCKET_CTX_INDEX = 1
43-
local SOCKET_CLIENT_CERT_INDEX = 6
44-
local SOCKET_CLIENT_PKEY_INDEX = 7
42+
local SOCKET_CTX_INDEX = 1
4543

4644

4745
local errmsg = base.get_errmsg_ptr()
@@ -51,8 +49,8 @@ local openssl_error_code = ffi.new("int[1]")
5149

5250
local function setclientcert(self, cert, pkey)
5351
if not cert or not pkey then
54-
self[SOCKET_CLIENT_CERT_INDEX] = nil
55-
self[SOCKET_CLIENT_PKEY_INDEX] = nil
52+
self.client_cert = nil
53+
self.client_pkey = nil
5654
return
5755
end
5856

@@ -64,8 +62,8 @@ local function setclientcert(self, cert, pkey)
6462
error("bad client pkey type", 2)
6563
end
6664

67-
self[SOCKET_CLIENT_CERT_INDEX] = cert
68-
self[SOCKET_CLIENT_PKEY_INDEX] = pkey
65+
self.client_cert = cert
66+
self.client_pkey = pkey
6967
end
7068

7169

@@ -94,17 +92,15 @@ local function sslhandshake(self, reused_session, server_name, ssl_verify,
9492
server_name_str[0].len = 0
9593
end
9694

97-
local u = self[SOCKET_CTX_INDEX]
98-
local client_cert = self[SOCKET_CLIENT_CERT_INDEX]
99-
local client_pkey = self[SOCKET_CLIENT_PKEY_INDEX]
95+
local u = self[SOCKET_CTX_INDEX]
10096

10197
local rc = C.ngx_http_lua_ffi_socket_tcp_sslhandshake(r, u,
10298
session_ptr[0],
10399
reused_session ~= false,
104100
server_name_str,
105101
ssl_verify and 1 or 0,
106102
send_status_req and 1 or 0,
107-
client_cert, client_pkey, errmsg)
103+
self.client_cert, self.client_pkey, errmsg)
108104

109105
if rc == FFI_NO_REQ_CTX then
110106
error("no request ctx found", 2)

0 commit comments

Comments
 (0)