Skip to content

Commit 1ff6506

Browse files
dndxdndx
committed
fixed failed tests because of session object type change.
1 parent 686e9da commit 1ff6506

File tree

4 files changed

+61
-61
lines changed

4 files changed

+61
-61
lines changed

‎t/ocsp.t

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ __DATA__
9797
GET /t
9898
--- response_body
9999
connected: 1
100-
ssl handshake: userdata
100+
ssl handshake: cdata
101101
102102
--- error_log
103-
lua ssl server name: "test.com"
103+
lua tls server name: "test.com"
104104
OCSP url found: http://127.0.0.1:8888/ocsp?foo=1,
105105
106106
--- no_error_log
@@ -189,10 +189,10 @@ OCSP url found: http://127.0.0.1:8888/ocsp?foo=1,
189189
GET /t
190190
--- response_body
191191
connected: 1
192-
ssl handshake: userdata
192+
ssl handshake: cdata
193193
194194
--- error_log
195-
lua ssl server name: "test.com"
195+
lua tls server name: "test.com"
196196
OCSP responder not found
197197
198198
--- no_error_log
@@ -281,10 +281,10 @@ OCSP responder not found
281281
GET /t
282282
--- response_body
283283
connected: 1
284-
ssl handshake: userdata
284+
ssl handshake: cdata
285285
286286
--- error_log
287-
lua ssl server name: "test.com"
287+
lua tls server name: "test.com"
288288
failed to get OCSP responder: no issuer certificate in chain
289289
290290
--- no_error_log
@@ -372,10 +372,10 @@ failed to get OCSP responder: no issuer certificate in chain
372372
GET /t
373373
--- response_body
374374
connected: 1
375-
ssl handshake: userdata
375+
ssl handshake: cdata
376376
377377
--- error_log
378-
lua ssl server name: "test.com"
378+
lua tls server name: "test.com"
379379
failed to get OCSP responder: issuer certificate not next to leaf
380380
381381
--- no_error_log
@@ -467,10 +467,10 @@ failed to get OCSP responder: issuer certificate not next to leaf
467467
GET /t
468468
--- response_body
469469
connected: 1
470-
ssl handshake: userdata
470+
ssl handshake: cdata
471471
472472
--- error_log
473-
lua ssl server name: "test.com"
473+
lua tls server name: "test.com"
474474
OCSP url found: http:/,
475475
still get an error: truncated
476476
@@ -564,10 +564,10 @@ still get an error: truncated
564564
GET /t
565565
--- response_body
566566
connected: 1
567-
ssl handshake: userdata
567+
ssl handshake: cdata
568568
569569
--- error_log
570-
lua ssl server name: "test.com"
570+
lua tls server name: "test.com"
571571
OCSP request created with length 68
572572
573573
--- no_error_log
@@ -657,10 +657,10 @@ OCSP request created with length 68
657657
GET /t
658658
--- response_body
659659
connected: 1
660-
ssl handshake: userdata
660+
ssl handshake: cdata
661661
662662
--- error_log
663-
lua ssl server name: "test.com"
663+
lua tls server name: "test.com"
664664
failed to create OCSP request: output buffer too small: 68 > 67
665665
666666
--- no_error_log
@@ -742,7 +742,7 @@ connected: 1
742742
failed to do SSL handshake: handshake failed
743743
744744
--- error_log
745-
lua ssl server name: "test.com"
745+
lua tls server name: "test.com"
746746
failed to create OCSP request: d2i_X509_bio() failed
747747
748748
--- no_error_log
@@ -831,10 +831,10 @@ failed to create OCSP request: d2i_X509_bio() failed
831831
GET /t
832832
--- response_body
833833
connected: 1
834-
ssl handshake: userdata
834+
ssl handshake: cdata
835835
836836
--- error_log
837-
lua ssl server name: "test.com"
837+
lua tls server name: "test.com"
838838
failed to create OCSP request: no issuer certificate in chain
839839
840840
--- no_error_log
@@ -922,10 +922,10 @@ failed to create OCSP request: no issuer certificate in chain
922922
GET /t
923923
--- response_body
924924
connected: 1
925-
ssl handshake: userdata
925+
ssl handshake: cdata
926926
927927
--- error_log
928-
lua ssl server name: "test.com"
928+
lua tls server name: "test.com"
929929
OCSP response validation ok
930930
931931
--- no_error_log
@@ -1015,10 +1015,10 @@ OCSP response validation ok
10151015
GET /t
10161016
--- response_body
10171017
connected: 1
1018-
ssl handshake: userdata
1018+
ssl handshake: cdata
10191019
10201020
--- error_log
1021-
lua ssl server name: "test.com"
1021+
lua tls server name: "test.com"
10221022
failed to validate OCSP response: no issuer certificate in chain
10231023
10241024
--- no_error_log
@@ -1107,10 +1107,10 @@ OCSP response validation ok
11071107
GET /t
11081108
--- response_body
11091109
connected: 1
1110-
ssl handshake: userdata
1110+
ssl handshake: cdata
11111111
11121112
--- error_log
1113-
lua ssl server name: "test.com"
1113+
lua tls server name: "test.com"
11141114
OCSP response validation ok
11151115
11161116
--- no_error_log
@@ -1202,10 +1202,10 @@ FIXME: we should complain in this case.
12021202
GET /t
12031203
--- response_body
12041204
connected: 1
1205-
ssl handshake: userdata
1205+
ssl handshake: cdata
12061206
12071207
--- error_log
1208-
lua ssl server name: "test.com"
1208+
lua tls server name: "test.com"
12091209
OCSP response validation ok
12101210
12111211
--- no_error_log
@@ -1296,10 +1296,10 @@ OCSP response validation ok
12961296
GET /t
12971297
--- response_body
12981298
connected: 1
1299-
ssl handshake: userdata
1299+
ssl handshake: cdata
13001300
13011301
--- error_log
1302-
lua ssl server name: "test.com"
1302+
lua tls server name: "test.com"
13031303
failed to validate OCSP response: OCSP_basic_verify() failed
13041304
13051305
--- no_error_log
@@ -1392,7 +1392,7 @@ connected: 1
13921392
failed to do SSL handshake: handshake failed
13931393
13941394
--- error_log
1395-
lua ssl server name: "test.com"
1395+
lua tls server name: "test.com"
13961396
failed to validate OCSP response: certificate status "revoked" in the OCSP response
13971397
13981398
--- no_error_log
@@ -1472,10 +1472,10 @@ FIXME: check the OCSP staple actually received by the ssl client
14721472
GET /t
14731473
--- response_body
14741474
connected: 1
1475-
ssl handshake: userdata
1475+
ssl handshake: cdata
14761476
14771477
--- error_log
1478-
lua ssl server name: "test.com"
1478+
lua tls server name: "test.com"
14791479
ocsp status resp set ok: nil,
14801480
14811481
--- no_error_log
@@ -1554,10 +1554,10 @@ ocsp status resp set ok: nil,
15541554
GET /t
15551555
--- response_body
15561556
connected: 1
1557-
ssl handshake: userdata
1557+
ssl handshake: cdata
15581558
15591559
--- error_log
1560-
lua ssl server name: "test.com"
1560+
lua tls server name: "test.com"
15611561
ocsp status resp set ok: no status req,
15621562
15631563
--- no_error_log

‎t/ssl-session-fetch.t

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ __DATA__
8989
GET /t
9090
--- response_body
9191
connected: 1
92-
ssl handshake: userdata
92+
ssl handshake: cdata
9393
close: 1 nil
9494
9595
--- grep_error_log eval
@@ -176,7 +176,7 @@ qr/ssl_session_fetch_by_lua_block:4: session id: [a-fA-f\d]+/s,
176176
GET /t
177177
--- response_body
178178
connected: 1
179-
ssl handshake: userdata
179+
ssl handshake: cdata
180180
close: 1 nil
181181
182182
--- grep_error_log eval
@@ -279,7 +279,7 @@ In practice, never store session in plaintext on persistent storage.
279279
GET /t
280280
--- response_body
281281
connected: 1
282-
ssl handshake: userdata
282+
ssl handshake: cdata
283283
close: 1 nil
284284
285285
--- grep_error_log eval
@@ -375,7 +375,7 @@ able to carry on and negotiate a new session.
375375
GET /t
376376
--- response_body
377377
connected: 1
378-
ssl handshake: userdata
378+
ssl handshake: cdata
379379
close: 1 nil
380380
381381
--- grep_error_log eval
@@ -578,7 +578,7 @@ $/s,
578578
GET /t
579579
--- response_body
580580
connected: 1
581-
ssl handshake: userdata
581+
ssl handshake: cdata
582582
close: 1 nil
583583
--- no_error_log
584584
[alert]

‎t/ssl-session-store.t

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ __DATA__
8585
GET /t
8686
--- response_body
8787
connected: 1
88-
ssl handshake: userdata
88+
ssl handshake: cdata
8989
close: 1 nil
9090
9191
--- error_log eval
@@ -157,7 +157,7 @@ qr/ssl_session_store_by_lua_block:4: session size: \d+/s
157157
GET /t
158158
--- response_body
159159
connected: 1
160-
ssl handshake: userdata
160+
ssl handshake: cdata
161161
close: 1 nil
162162
163163
--- error_log eval
@@ -265,7 +265,7 @@ qr/ssl_session_store_by_lua_block:4: session id: [a-fA-f\d]+/s
265265
GET /t
266266
--- response_body
267267
connected: 1
268-
ssl handshake: userdata
268+
ssl handshake: cdata
269269
close: 1 nil
270270
271271
--- error_log eval

0 commit comments

Comments
 (0)