Commit cdcb6adf8c for openssl.org
commit cdcb6adf8c399c14a5ee8cad5c76b6cc9e333e82
Author: Andrew Dinh <andrewd@openssl.org>
Date: Sat Jul 18 19:43:18 2026 +0700
Port script_29
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:59 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 c4a965ac43..96b1b256cf 100644
--- a/test/quic_multistream_test.c
+++ b/test/quic_multistream_test.c
@@ -2282,28 +2282,7 @@ static const struct script_op script_28[] = {
/* 29. Fault injection - received RESET_STREAM for nonexistent send-only stream */
static const struct script_op script_29[] = {
- OP_S_SET_INJECT_PLAIN(script_28_inject_plain),
- OP_C_SET_ALPN("ossltest"),
- OP_C_CONNECT_WAIT(),
- OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE),
-
- OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0)),
- OP_C_WRITE(a, "orange", 6),
-
- OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0)),
- OP_S_READ_EXPECT(a, "orange", 6),
-
- OP_C_NEW_STREAM_UNI(b, C_UNI_ID(0)),
- OP_C_WRITE(b, "apple", 5),
-
- OP_S_BIND_STREAM_ID(b, C_UNI_ID(0)),
- OP_S_READ_EXPECT(b, "apple", 5),
-
- OP_SET_INJECT_WORD(C_UNI_ID(1) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM),
- OP_S_WRITE(a, "fruit", 5),
-
- OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_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 488cbf830f..fa96845ea2 100644
--- a/test/radix/quic_tests.c
+++ b/test/radix/quic_tests.c
@@ -2089,8 +2089,30 @@ DEF_SCRIPT(script_28, "Fault injection - received RESET_STREAM for send-only str
OP_EXPECT_CONN_CLOSE_INFO(C, OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0);
}
-DEF_SCRIPT(script_29, "place holder for multistrem script_29")
+/* 29. Fault injection - received RESET_STREAM for nonexistent send-only stream */
+DEF_SCRIPT(script_29, "Fault injection - received RESET_STREAM for nonexistent send-only stream")
{
+ OP_SIMPLE_PAIR_CONN_ND();
+ OP_ACCEPT_CONN_WAIT_ND(L, S, 0);
+
+ OP_SET_INJECT_PLAIN(S, inject_stream_frame_plain);
+
+ OP_NEW_STREAM(C, Ca, 0 /* bidirectional */);
+ OP_WRITE(Ca, "orange", 6);
+
+ OP_ACCEPT_STREAM_WAIT(S, Sa, 0);
+ OP_READ_EXPECT(Sa, "orange", 6);
+
+ OP_NEW_STREAM(C, Cb, SSL_STREAM_FLAG_UNI);
+ OP_WRITE(Cb, "apple", 5);
+
+ OP_ACCEPT_STREAM_WAIT(S, Sb, 0);
+ OP_READ_EXPECT(Sb, "apple", 5);
+
+ OP_SET_INJECT_WORD(C_UNI_ID(1) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM);
+ OP_WRITE(Sa, "fruit", 5);
+
+ OP_EXPECT_CONN_CLOSE_INFO(C, OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0);
}
DEF_SCRIPT(script_30, "place holder for multistrem script_30")