Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)
if (!ch->use_qlog)
return NULL;
+ if (ch->is_server && ch->init_dcid.id_len == 0)
+ return NULL;
+
qti.odcid = ch->init_dcid;
qti.title = ch->qlog_title;
qti.description = NULL;
QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_INTERNAL_ERROR, NULL);
return 0;
}
-#ifndef OPENSSL_NO_QLOG
- args.use_qlog = 1; /* disabled if env not set */
- args.qlog_title = qc->ssl.ctx->qlog_title;
-#endif
port_args.channel_ctx = qc->ssl.ctx;
qc->port = ossl_quic_engine_create_port(qc->engine, &port_args);
if (args.tls == NULL)
return NULL;
+#ifndef OPENSSL_NO_QLOG
+ args.use_qlog = 1; /* disabled if env not set */
+ args.qlog_title = args.tls->ctx->qlog_title;
+#endif
+
ch = ossl_quic_channel_new(&args);
if (ch == NULL) {
if (tls == NULL)
ENDIF
IF[{- !$disabled{qlog} -}]
- SOURCE[json_test]=json_test.c helpers/ssltestlib.c helpers/quictestlib.c
+ SOURCE[json_test]=json_test.c helpers/ssltestlib.c $QUICTESTHELPERS
INCLUDE[json_test]=../include ../apps/include
DEPEND[json_test]=../libcrypto.a ../libssl.a libtestutil.a
ENDIF