From 63e484885336e08b5800370d69c8869f9b8e7f22 Mon Sep 17 00:00:00 2001
From: Jarry Shaw <jarryshaw@icloud.com>
Date: Mon, 2 Nov 2026 01:43:46 -0500
Subject: [PATCH] fix(protocols): re-export the DTLS connection-ID data and
 schema names (#2515)

#2631 added DTLSCIDCiphertext (data and schema) and the TLS ConnectionId
extension data to their submodules' __all__ but not to the packages, so
test_every_package_reexports_every_child_export failed on main.

- data.application: DTLS_CIDCiphertext, TLS_ConnectionId
- schema.application: DTLS_CIDCiphertext
- data and schema aggregators list the same names in __all__

Aliases follow the <protocol>_<name> form the siblings use
(DTLS_Ciphertext, TLS_ExtensionData). The test is not tier-gated; it fails
on 3.14 as well, and passes on 3.14 and 3.15 with this change.
---
 pcapkit/protocols/data/__init__.py               | 4 ++--
 pcapkit/protocols/data/application/__init__.py   | 6 ++++--
 pcapkit/protocols/schema/__init__.py             | 2 +-
 pcapkit/protocols/schema/application/__init__.py | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pcapkit/protocols/data/__init__.py b/pcapkit/protocols/data/__init__.py
index 45d5a9df13..38650a76df 100644
--- a/pcapkit/protocols/data/__init__.py
+++ b/pcapkit/protocols/data/__init__.py
@@ -282,7 +282,7 @@
     'UDP',
 
     # Datagram Transport Layer Security
-    'DTLS', 'DTLS_Ciphertext', 'DTLS_Handshake',
+    'DTLS', 'DTLS_Ciphertext', 'DTLS_CIDCiphertext', 'DTLS_Handshake',
 
     # File Transfer Protocol
     'FTP',
@@ -315,7 +315,7 @@
     # Transport Layer Security
     'TLS',
     'TLS_Handshake', 'TLS_ClientHello', 'TLS_ServerHello', 'TLS_EncryptedExtensions',
-    'TLS_Extension', 'TLS_ExtensionData',
+    'TLS_Extension', 'TLS_ExtensionData', 'TLS_ConnectionId',
     'TLS_ServerName', 'TLS_ServerNameList', 'TLS_NamedGroupList', 'TLS_SignatureSchemeList',
     'TLS_ProtocolNameList', 'TLS_SupportedVersionsClientHello', 'TLS_SupportedVersionsServerHello',
     'TLS_KeyShareEntry', 'TLS_KeyShareClientHello', 'TLS_KeyShareHelloRetryRequest',
diff --git a/pcapkit/protocols/data/application/__init__.py b/pcapkit/protocols/data/application/__init__.py
index c915b7af41..4b2624b122 100644
--- a/pcapkit/protocols/data/application/__init__.py
+++ b/pcapkit/protocols/data/application/__init__.py
@@ -3,6 +3,7 @@
 
 # Datagram Transport Layer Security
 from pcapkit.protocols.data.application.dtls import DTLS
+from pcapkit.protocols.data.application.dtls import DTLSCIDCiphertext as DTLS_CIDCiphertext
 from pcapkit.protocols.data.application.dtls import DTLSCiphertext as DTLS_Ciphertext
 from pcapkit.protocols.data.application.dtls import DTLSHandshake as DTLS_Handshake
 
@@ -64,6 +65,7 @@
 from pcapkit.protocols.data.application.tls import Alert as TLS_Alert
 from pcapkit.protocols.data.application.tls import ChangeCipherSpec as TLS_ChangeCipherSpec
 from pcapkit.protocols.data.application.tls import ClientHello as TLS_ClientHello
+from pcapkit.protocols.data.application.tls import ConnectionId as TLS_ConnectionId
 from pcapkit.protocols.data.application.tls import EncryptedExtensions as TLS_EncryptedExtensions
 from pcapkit.protocols.data.application.tls import Extension as TLS_Extension
 from pcapkit.protocols.data.application.tls import ExtensionData as TLS_ExtensionData
@@ -86,7 +88,7 @@
 
 __all__ = [
     # Datagram Transport Layer Security
-    'DTLS', 'DTLS_Ciphertext', 'DTLS_Handshake',
+    'DTLS', 'DTLS_Ciphertext', 'DTLS_CIDCiphertext', 'DTLS_Handshake',
 
     # File Transfer Protocol
     'FTP',
@@ -119,7 +121,7 @@
     # Transport Layer Security
     'TLS',
     'TLS_Handshake', 'TLS_ClientHello', 'TLS_ServerHello', 'TLS_EncryptedExtensions',
-    'TLS_Extension', 'TLS_ExtensionData',
+    'TLS_Extension', 'TLS_ExtensionData', 'TLS_ConnectionId',
     'TLS_ServerName', 'TLS_ServerNameList', 'TLS_NamedGroupList', 'TLS_SignatureSchemeList',
     'TLS_ProtocolNameList', 'TLS_SupportedVersionsClientHello', 'TLS_SupportedVersionsServerHello',
     'TLS_KeyShareEntry', 'TLS_KeyShareClientHello', 'TLS_KeyShareHelloRetryRequest',
diff --git a/pcapkit/protocols/schema/__init__.py b/pcapkit/protocols/schema/__init__.py
index 302d89c934..5e75df69f6 100644
--- a/pcapkit/protocols/schema/__init__.py
+++ b/pcapkit/protocols/schema/__init__.py
@@ -195,7 +195,7 @@
     'SCTP_ProtocolViolationCause',
 
     # Application Layer Protocols
-    'DTLS', 'DTLS_Ciphertext',
+    'DTLS', 'DTLS_Ciphertext', 'DTLS_CIDCiphertext',
     'FTP',
     'NGAP',
     'OSPF', 'OSPF_CryptographicAuthentication',
diff --git a/pcapkit/protocols/schema/application/__init__.py b/pcapkit/protocols/schema/application/__init__.py
index 19ad3d9d19..f0f4785526 100644
--- a/pcapkit/protocols/schema/application/__init__.py
+++ b/pcapkit/protocols/schema/application/__init__.py
@@ -3,6 +3,7 @@
 
 # Datagram Transport Layer Security
 from pcapkit.protocols.schema.application.dtls import DTLS
+from pcapkit.protocols.schema.application.dtls import DTLSCIDCiphertext as DTLS_CIDCiphertext
 from pcapkit.protocols.schema.application.dtls import DTLSCiphertext as DTLS_Ciphertext
 
 # File Transfer Protocol
@@ -49,7 +50,7 @@
 
 __all__ = [
     # Datagram Transport Layer Security
-    'DTLS', 'DTLS_Ciphertext',
+    'DTLS', 'DTLS_Ciphertext', 'DTLS_CIDCiphertext',
 
     # File Transfer Protocol
     'FTP',