Skip to content

Commit ee753ec

Browse files
author
Tuure Vartiainen
committed
tests: fixed a typo and adjusted expected error_log output in ssl-psk.t
1 parent 2623195 commit ee753ec

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

t/ssl-psk.t

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ __DATA__
4747
4848
print("client psk identity: ", psk_identity)
4949
50-
local ok, err = ssl.set_psk_key(key)
50+
local ok, err = ssl.set_psk_key(psk_key)
5151
if not ok then
5252
ngx.log(ngx.ERR, "failed to set psk key: ", err)
5353
return ngx.ERROR
@@ -150,6 +150,7 @@ client psk identity: psk_test_identity
150150
151151
=== TEST 2: TLS-PSK mismatching key
152152
--- http_config
153+
lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH/?.lua;;";
153154
server {
154155
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl;
155156
server_name test.com;
@@ -170,7 +171,7 @@ client psk identity: psk_test_identity
170171
171172
print("client psk identity: ", psk_identity)
172173
173-
local ok, err = ssl.set_psk_key(key)
174+
local ok, err = ssl.set_psk_key(psk_key)
174175
if not ok then
175176
ngx.log(ngx.ERR, "failed to set psk key: ", err)
176177
return ngx.ERROR
@@ -251,11 +252,13 @@ GET /t
251252
connected: 1
252253
failed to do SSL handshake: handshake failed
253254
254-
--- error_log
255-
lua ssl server name: "test.com"
256-
client psk identity: psk_test_identity
255+
--- error_log eval
256+
[
257+
qr/lua ssl server name: "test.com"/s,
258+
qr/client psk identity: psk_test_identity/s,
259+
qr/\[error\] .*? SSL_do_handshake\(\) failed .*? alert bad record mac/s,
260+
]
257261
258262
--- no_error_log
259263
[alert]
260264
[emerg]
261-
[error]

0 commit comments

Comments
 (0)