Commit 7bdfc9310b for openssl.org
commit 7bdfc9310b389fed67dd93c37c8ed3e96ce591d1
Author: Andrew Dinh <andrewd@openssl.org>
Date: Sat Jul 18 19:26:01 2026 +0700
Port script_27
Assisted-by: Claude:claude-sonnet-5
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Saša NedvÄ›dický <sashan@openssl.org>
MergeDate: Sat Aug 1 12:44:48 2026
(Merged from https://github.com/openssl/openssl/pull/32023)
diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c
index 6f6b6aeeb8..539d155a45 100644
--- a/test/quic_multistream_test.c
+++ b/test/quic_multistream_test.c
@@ -2213,40 +2213,6 @@ static const struct script_op script_23[] = {
};
/* 24. Fault injection - excess value of MAX_STREAMS_BIDI */
-static int script_24_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
- unsigned char *buf, size_t len)
-{
- int ok = 0;
- WPACKET wpkt;
- unsigned char frame_buf[16];
- size_t written;
-
- if (h->inject_word0 == 0 || hdr->type != QUIC_PKT_TYPE_1RTT)
- return 1;
-
- if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
- sizeof(frame_buf), 0)))
- return 0;
-
- if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, h->inject_word1))
- || !TEST_true(WPACKET_quic_write_vlint(&wpkt, (((uint64_t)1) << 60) + 1)))
- goto err;
-
- if (!TEST_true(WPACKET_get_total_written(&wpkt, &written)))
- goto err;
-
- if (!qtest_fault_prepend_frame(h->qtf, frame_buf, written))
- goto err;
-
- ok = 1;
-err:
- if (ok)
- WPACKET_finish(&wpkt);
- else
- WPACKET_cleanup(&wpkt);
- return ok;
-}
-
static const struct script_op script_24[] = {
/* test moved to test/radix/quic_tests.c */
OP_END
@@ -2266,20 +2232,7 @@ static const struct script_op script_26[] = {
/* 27. Fault injection - excess value of STREAMS_BLOCKED_UNI */
static const struct script_op script_27[] = {
- OP_S_SET_INJECT_PLAIN(script_24_inject_plain),
- OP_C_SET_ALPN("ossltest"),
- OP_C_CONNECT_WAIT(),
-
- OP_C_WRITE(DEFAULT, "apple", 5),
- OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0)),
- OP_S_READ_EXPECT(a, "apple", 5),
-
- OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI),
-
- OP_S_WRITE(a, "orange", 6),
-
- OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR, 0, 0),
-
+ /* test moved to test/radix/quic_tests.c */
OP_END
};
diff --git a/test/radix/quic_tests.c b/test/radix/quic_tests.c
index 6555993064..538fa38187 100644
--- a/test/radix/quic_tests.c
+++ b/test/radix/quic_tests.c
@@ -2010,8 +2010,23 @@ DEF_SCRIPT(script_26, "Fault injection - excess value of STREAMS_BLOCKED_BIDI")
OP_EXPECT_CONN_CLOSE_INFO(C, OSSL_QUIC_ERR_STREAM_LIMIT_ERROR, 0, 0);
}
-DEF_SCRIPT(script_27, "place holder for multistrem script_27")
+/* 27. Fault injection - excess value of STREAMS_BLOCKED_UNI */
+DEF_SCRIPT(script_27, "Fault injection - excess value of STREAMS_BLOCKED_UNI")
{
+ OP_SIMPLE_PAIR_CONN();
+ OP_ACCEPT_CONN_WAIT(L, S, 0);
+
+ OP_SET_INJECT_PLAIN(S, script_24_inject_plain);
+
+ OP_WRITE(C, "apple", 5);
+ OP_ACCEPT_STREAM_WAIT(S, Sa, 0);
+ OP_READ_EXPECT(Sa, "apple", 5);
+
+ OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI);
+
+ OP_WRITE(Sa, "orange", 6);
+
+ OP_EXPECT_CONN_CLOSE_INFO(C, OSSL_QUIC_ERR_STREAM_LIMIT_ERROR, 0, 0);
}
DEF_SCRIPT(script_28, "place holder for multistrem script_28")