From f90ef06a3045119dcc88b72d8b98ca60e3c00d5a Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Mon, 14 Aug 2023 18:10:42 +0000
Subject: [PATCH] Prepare tlsfuzzer.py for ports update

---
 regress/lib/libssl/tlsfuzzer/tlsfuzzer.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py b/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py
index a31c8fae03c..4b29dded417 100644
--- a/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py
+++ b/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py
@@ -1,4 +1,4 @@
-#   $OpenBSD: tlsfuzzer.py,v 1.51 2023/08/03 20:13:12 tb Exp $
+#   $OpenBSD: tlsfuzzer.py,v 1.52 2023/08/14 18:10:42 tb Exp $
 #
 # Copyright (c) 2020 Theo Buehler <tb@openbsd.org>
 #
@@ -370,7 +370,6 @@ tls12_tests = TestGroup("TLSv1.2 tests", [
     Test("test-message-skipping.py"),
     Test("test-no-heartbeat.py"),
     Test("test-record-layer-fragmentation.py"),
-    Test("test-sessionID-resumption.py"),
     Test("test-sslv2-connection.py"),
     Test("test-truncating-of-finished.py"),
     Test("test-truncating-of-kRSA-client-key-exchange.py"),
@@ -388,7 +387,7 @@ tls12_tests = TestGroup("TLSv1.2 tests", [
     Test(
         "test-ccs.py", [
             "-x", "two bytes long CCS",
-            "-X", "does not match received \"decode_error\"",
+            "-X", substitute_alert("unexpected_message", "decode_error"),
         ]
     ),
     Test(
@@ -439,6 +438,11 @@ tls12_tests = TestGroup("TLSv1.2 tests", [
         "-e", "drop extended_master_secret in renegotiation",
     ]),
 
+    Test("test-sessionID-resumption.py", [
+        "-x", "Client Hello too long session ID",
+        "-X", substitute_alert("decode_error", "illegal_parameter"),
+    ]),
+
     # Without --sig-algs-drop-ok, two tests fail since we do not currently
     # implement the signature_algorithms_cert extension (although we MUST).
     Test("test-sig-algs-renegotiation-resumption.py", ["--sig-algs-drop-ok"]),
@@ -558,6 +562,12 @@ tls12_failing_tests = TestGroup("failing TLSv1.2 tests", [
     # 'resumption with cipher from old CH but not selected by server'
     Test("test-resumption-with-wrong-ciphers.py"),
 
+    # 'session resumption with empty session_id'
+    # 'session resumption with random session_id'
+    # 'session resumption with renegotiation'
+    # AssertionError: Server did not send extension(s): session_ticket
+    Test("test-session-ticket-resumption.py"),
+
     # 5 failures:
     #   'empty sigalgs'
     #   'only undefined sigalgs'
-- 
2.20.1