eclipse-paho · akx · Dec 24, 2023 · Dec 24, 2023 · Dec 24, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,16 @@
+name: build
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3
+      - run: pip install build
+      - run: python -m build .
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
-*.pyc
-__pycache__
+*.egg-info
+*.log
+*.py[cod]
 *~
+/build
+/dist
+tests
diff --git a/interoperability/MQTT Tests.ods → MQTT Tests.ods b/interoperability/MQTT Tests.ods → MQTT Tests.ods
diff --git a/README.md b/README.md
@@ -2,16 +2,14 @@
 
 The Paho Testing Utilities are a collection of code and tools to help test MQTT clients and Brokers.
 
-All the features are currently in the interoperability directory.  The components, or capabilities include:
+The components, or capabilities include:
 
 - a Python MQTT broker which implements versions 3.1.1 and 5.0 (plus the start of MQTT-SN support)
 - a simple Python MQTT client, also supporting versions 3.1.1 and 5.0, used for simple general test suites
 - an MQTT network proxy, which can forward traffic to and from a broker, and display the MQTT packet info
 - Python modules to de/serialize MQTT packets for MQTT 3.1.1 and 5.0
 - an MQTT load/connection loss test, designed to investigate the reconnection logic for QoS 1 and 2 flows
 
-Check the readme in the interoperability directory for details.
-
 ## Links
 
 - Project Website: [https://www.eclipse.org/paho](https://www.eclipse.org/paho)
@@ -21,3 +19,54 @@ Check the readme in the interoperability directory for details.
 - Twitter: [@eclipsepaho](https://twitter.com/eclipsepaho)
 - Issues: [https://github.com/eclipse/paho.mqtt.testing/issues](https://github.com/eclipse/paho.mqtt.testing/issues)
 - Mailing-list: [https://dev.eclipse.org/mailman/listinfo/paho-dev](https://dev.eclipse.org/mailman/listinfo/paho-dev)
+
+## Usage
+
+### MQTT Version 5
+
+Start a broker:
+
+  python3 startbroker.py
+
+Run client tests:
+
+  python3 client_test5.py
+
+various options are available, individual tests can be run with:
+
+  python3 client_test5.py Test.test_name  
+
+As yet unimplemented features:
+
+  https://github.com/eclipse/paho.mqtt.testing/issues
+
+Sub-packages:
+
+  mqtt/formats/MQTTV5 - packet serialization and deserialization
+  mqtt/clients/V5 - test client implementation
+  mqtt/brokers/V5 - test broker implementation
+
+### MQTT Version 3
+
+Start a broker:
+
+  python3 startbroker.py
+
+Run client tests:
+
+  python3 client_test.py
+
+### TLS
+
+A configuration file similar to that of Eclipse Mosquitto can be passed to startbroker:
+
+  python3 startbroker.py -c client_testing.conf
+
+so for example, a TCP listener with TLS support can be configured like this:
+
+  listener 18884
+  cafile tls_testing/keys/all-ca.crt
+  certfile tls_testing/keys/server/server.crt
+  keyfile tls_testing/keys/server/server.key
+  require_certificate true
+
diff --git a/interoperability/bridge_testA.py → bridge_testA.py b/interoperability/bridge_testA.py → bridge_testA.py
diff --git a/interoperability/bridge_testB.py → bridge_testB.py b/interoperability/bridge_testB.py → bridge_testB.py
diff --git a/interoperability/client_test.py → client_test.py b/interoperability/client_test.py → client_test.py
diff --git a/interoperability/client_test5.py → client_test5.py b/interoperability/client_test5.py → client_test5.py
diff --git a/interoperability/client_testing.conf → client_testing.conf b/interoperability/client_testing.conf → client_testing.conf
diff --git a/interoperability/.gitignore b/interoperability/.gitignore
diff --git a/interoperability/README.md b/interoperability/README.md
diff --git a/interoperability/localhost_testing.conf → localhost_testing.conf b/interoperability/localhost_testing.conf → localhost_testing.conf
diff --git a/interoperability/mbt/__init__.py → mbt/__init__.py b/interoperability/mbt/__init__.py → mbt/__init__.py
diff --git a/interoperability/mbt/main.py → mbt/main.py b/interoperability/mbt/main.py → mbt/main.py
diff --git a/interoperability/mqtt test spreadsheet.ods → mqtt test spreadsheet.ods b/interoperability/mqtt test spreadsheet.ods → mqtt test spreadsheet.ods
diff --git a/interoperability/mqtt/__init__.py → mqtt/__init__.py b/interoperability/mqtt/__init__.py → mqtt/__init__.py
diff --git a/interoperability/mqtt/brokers/SN/Brokers.py → mqtt/brokers/SN/Brokers.py b/interoperability/mqtt/brokers/SN/Brokers.py → mqtt/brokers/SN/Brokers.py
diff --git a/...rability/mqtt/brokers/SN/MQTTSNBrokers.py → mqtt/brokers/SN/MQTTSNBrokers.py b/...rability/mqtt/brokers/SN/MQTTSNBrokers.py → mqtt/brokers/SN/MQTTSNBrokers.py
diff --git a/interoperability/mqtt/brokers/SN/__init__.py → mqtt/brokers/SN/__init__.py b/interoperability/mqtt/brokers/SN/__init__.py → mqtt/brokers/SN/__init__.py
diff --git a/...roperability/mqtt/brokers/V311/Brokers.py → mqtt/brokers/V311/Brokers.py b/...roperability/mqtt/brokers/V311/Brokers.py → mqtt/brokers/V311/Brokers.py
diff --git a/...rability/mqtt/brokers/V311/MQTTBrokers.py → mqtt/brokers/V311/MQTTBrokers.py b/...rability/mqtt/brokers/V311/MQTTBrokers.py → mqtt/brokers/V311/MQTTBrokers.py
diff --git a/.../mqtt/brokers/V311/SubscriptionEngines.py → mqtt/brokers/V311/SubscriptionEngines.py b/.../mqtt/brokers/V311/SubscriptionEngines.py → mqtt/brokers/V311/SubscriptionEngines.py
diff --git a/...bility/mqtt/brokers/V311/Subscriptions.py → mqtt/brokers/V311/Subscriptions.py b/...bility/mqtt/brokers/V311/Subscriptions.py → mqtt/brokers/V311/Subscriptions.py
diff --git a/interoperability/mqtt/brokers/V311/Topics.py → mqtt/brokers/V311/Topics.py b/interoperability/mqtt/brokers/V311/Topics.py → mqtt/brokers/V311/Topics.py
diff --git a/...operability/mqtt/brokers/V311/__init__.py → mqtt/brokers/V311/__init__.py b/...operability/mqtt/brokers/V311/__init__.py → mqtt/brokers/V311/__init__.py
diff --git a/interoperability/mqtt/brokers/V5/Brokers.py → mqtt/brokers/V5/Brokers.py b/interoperability/mqtt/brokers/V5/Brokers.py → mqtt/brokers/V5/Brokers.py
diff --git a/...perability/mqtt/brokers/V5/MQTTBrokers.py → mqtt/brokers/V5/MQTTBrokers.py b/...perability/mqtt/brokers/V5/MQTTBrokers.py → mqtt/brokers/V5/MQTTBrokers.py
diff --git a/...ty/mqtt/brokers/V5/SubscriptionEngines.py → mqtt/brokers/V5/SubscriptionEngines.py b/...ty/mqtt/brokers/V5/SubscriptionEngines.py → mqtt/brokers/V5/SubscriptionEngines.py
diff --git a/...rability/mqtt/brokers/V5/Subscriptions.py → mqtt/brokers/V5/Subscriptions.py b/...rability/mqtt/brokers/V5/Subscriptions.py → mqtt/brokers/V5/Subscriptions.py
diff --git a/interoperability/mqtt/brokers/V5/Topics.py → mqtt/brokers/V5/Topics.py b/interoperability/mqtt/brokers/V5/Topics.py → mqtt/brokers/V5/Topics.py
diff --git a/interoperability/mqtt/brokers/V5/__init__.py → mqtt/brokers/V5/__init__.py b/interoperability/mqtt/brokers/V5/__init__.py → mqtt/brokers/V5/__init__.py
diff --git a/interoperability/mqtt/brokers/__init__.py → mqtt/brokers/__init__.py b/interoperability/mqtt/brokers/__init__.py → mqtt/brokers/__init__.py
diff --git a/...bility/mqtt/brokers/bridges/TCPBridges.py → mqtt/brokers/bridges/TCPBridges.py b/...bility/mqtt/brokers/bridges/TCPBridges.py → mqtt/brokers/bridges/TCPBridges.py
diff --git a/interoperability/mqtt/brokers/coverage.py → mqtt/brokers/coverage.py b/interoperability/mqtt/brokers/coverage.py → mqtt/brokers/coverage.py
diff --git a/...y/mqtt/brokers/listeners/HTTPListeners.py → mqtt/brokers/listeners/HTTPListeners.py b/...y/mqtt/brokers/listeners/HTTPListeners.py → mqtt/brokers/listeners/HTTPListeners.py
diff --git a/...ty/mqtt/brokers/listeners/TCPListeners.py → mqtt/brokers/listeners/TCPListeners.py b/...ty/mqtt/brokers/listeners/TCPListeners.py → mqtt/brokers/listeners/TCPListeners.py
diff --git a/...ty/mqtt/brokers/listeners/UDPListeners.py → mqtt/brokers/listeners/UDPListeners.py b/...ty/mqtt/brokers/listeners/UDPListeners.py → mqtt/brokers/listeners/UDPListeners.py
diff --git a/interoperability/mqtt/brokers/start.py → mqtt/brokers/start.py b/interoperability/mqtt/brokers/start.py → mqtt/brokers/start.py
diff --git a/...operability/mqtt/clients/V311/__init__.py → mqtt/clients/V311/__init__.py b/...operability/mqtt/clients/V311/__init__.py → mqtt/clients/V311/__init__.py
diff --git a/...operability/mqtt/clients/V311/internal.py → mqtt/clients/V311/internal.py b/...operability/mqtt/clients/V311/internal.py → mqtt/clients/V311/internal.py
diff --git a/interoperability/mqtt/clients/V311/main.py → mqtt/clients/V311/main.py b/interoperability/mqtt/clients/V311/main.py → mqtt/clients/V311/main.py
diff --git a/interoperability/mqtt/clients/V5/__init__.py → mqtt/clients/V5/__init__.py b/interoperability/mqtt/clients/V5/__init__.py → mqtt/clients/V5/__init__.py
diff --git a/interoperability/mqtt/clients/V5/internal.py → mqtt/clients/V5/internal.py b/interoperability/mqtt/clients/V5/internal.py → mqtt/clients/V5/internal.py
diff --git a/interoperability/mqtt/clients/V5/main.py → mqtt/clients/V5/main.py b/interoperability/mqtt/clients/V5/main.py → mqtt/clients/V5/main.py
diff --git a/interoperability/mqtt/clients/__init__.py → mqtt/clients/__init__.py b/interoperability/mqtt/clients/__init__.py → mqtt/clients/__init__.py
diff --git a/...operability/mqtt/formats/MQTTSN/MQTTSN.py → mqtt/formats/MQTTSN/MQTTSN.py b/...operability/mqtt/formats/MQTTSN/MQTTSN.py → mqtt/formats/MQTTSN/MQTTSN.py
diff --git a/...erability/mqtt/formats/MQTTSN/__init__.py → mqtt/formats/MQTTSN/__init__.py b/...erability/mqtt/formats/MQTTSN/__init__.py → mqtt/formats/MQTTSN/__init__.py
diff --git a/interoperability/mqtt/formats/MQTTSN/test.py → mqtt/formats/MQTTSN/test.py b/interoperability/mqtt/formats/MQTTSN/test.py → mqtt/formats/MQTTSN/test.py
diff --git a/...ability/mqtt/formats/MQTTV311/MQTTV311.py → mqtt/formats/MQTTV311/MQTTV311.py b/...ability/mqtt/formats/MQTTV311/MQTTV311.py → mqtt/formats/MQTTV311/MQTTV311.py
diff --git a/...ability/mqtt/formats/MQTTV311/__init__.py → mqtt/formats/MQTTV311/__init__.py b/...ability/mqtt/formats/MQTTV311/__init__.py → mqtt/formats/MQTTV311/__init__.py
diff --git a/...operability/mqtt/formats/MQTTV5/MQTTV5.py → mqtt/formats/MQTTV5/MQTTV5.py b/...operability/mqtt/formats/MQTTV5/MQTTV5.py → mqtt/formats/MQTTV5/MQTTV5.py
diff --git a/...erability/mqtt/formats/MQTTV5/__init__.py → mqtt/formats/MQTTV5/__init__.py b/...erability/mqtt/formats/MQTTV5/__init__.py → mqtt/formats/MQTTV5/__init__.py
diff --git a/interoperability/mqtt/formats/MQTTV5/test.py → mqtt/formats/MQTTV5/test.py b/interoperability/mqtt/formats/MQTTV5/test.py → mqtt/formats/MQTTV5/test.py
diff --git a/interoperability/mqtt/formats/__init__.py → mqtt/formats/__init__.py b/interoperability/mqtt/formats/__init__.py → mqtt/formats/__init__.py
diff --git a/interoperability/mqtt/proxy/__init__.py → mqtt/proxy/__init__.py b/interoperability/mqtt/proxy/__init__.py → mqtt/proxy/__init__.py
diff --git a/interoperability/mqtt/proxy/mqttsas.py → mqtt/proxy/mqttsas.py b/interoperability/mqtt/proxy/mqttsas.py → mqtt/proxy/mqttsas.py
diff --git a/interoperability/mqtt/proxy/wmqttsas.py → mqtt/proxy/wmqttsas.py b/interoperability/mqtt/proxy/wmqttsas.py → mqtt/proxy/wmqttsas.py
diff --git a/interoperability/mqtt/restart/control.py → mqtt/restart/control.py b/interoperability/mqtt/restart/control.py → mqtt/restart/control.py
diff --git a/interoperability/mqtt/restart/netproxy.py → mqtt/restart/netproxy.py b/interoperability/mqtt/restart/netproxy.py → mqtt/restart/netproxy.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,42 @@
+[build-system]
+requires = ["hatchling", "hatch-vcs"]
+build-backend = "hatchling.build"
+
+[project]
+name = "paho-mqtt-testing"
+dynamic = ["version"]
+description = ""
+readme = "README.md"
+requires-python = ">=3.8"
+keywords = []
+authors = []
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = []
+
+[project.urls]
+Documentation = "https://github.com/eclipse/paho.mqtt.testing#readme"
+Issues = "https://github.com/eclipse/paho.mqtt.testing/issues"
+Source = "https://github.com/eclipse/paho.mqtt.testing"
+
+[tool.hatch.version]
+source = "vcs"
+
+[tool.coverage.report]
+exclude_lines = [
+  "no cov",
+  "if __name__ == .__main__.:",
+  "if TYPE_CHECKING:",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["mqtt"]
diff --git a/interoperability/run_proxy.py → run_proxy.py b/interoperability/run_proxy.py → run_proxy.py
diff --git a/interoperability/run_restart_proxy.py → run_restart_proxy.py b/interoperability/run_restart_proxy.py → run_restart_proxy.py
diff --git a/interoperability/run_test.py → run_test.py b/interoperability/run_test.py → run_test.py
diff --git a/interoperability/specifications/MQTTV311.py → specifications/MQTTV311.py b/interoperability/specifications/MQTTV311.py → specifications/MQTTV311.py
diff --git a/interoperability/specifications/MQTTV5.py → specifications/MQTTV5.py b/interoperability/specifications/MQTTV5.py → specifications/MQTTV5.py
diff --git a/interoperability/startbroker.py → startbroker.py b/interoperability/startbroker.py → startbroker.py
diff --git a/interoperability/suite_generate.py → suite_generate.py b/interoperability/suite_generate.py → suite_generate.py
diff --git a/interoperability/testsuites/basic/test.log.1 → testsuites/basic/test.log.1 b/interoperability/testsuites/basic/test.log.1 → testsuites/basic/test.log.1
diff --git a/...roperability/testsuites/basic/test.log.10 → testsuites/basic/test.log.10 b/...roperability/testsuites/basic/test.log.10 → testsuites/basic/test.log.10
diff --git a/...roperability/testsuites/basic/test.log.12 → testsuites/basic/test.log.12 b/...roperability/testsuites/basic/test.log.12 → testsuites/basic/test.log.12
diff --git a/...roperability/testsuites/basic/test.log.13 → testsuites/basic/test.log.13 b/...roperability/testsuites/basic/test.log.13 → testsuites/basic/test.log.13
diff --git a/...roperability/testsuites/basic/test.log.24 → testsuites/basic/test.log.24 b/...roperability/testsuites/basic/test.log.24 → testsuites/basic/test.log.24
diff --git a/interoperability/testsuites/basic/test.log.3 → testsuites/basic/test.log.3 b/interoperability/testsuites/basic/test.log.3 → testsuites/basic/test.log.3
diff --git a/interoperability/testsuites/basic/test.log.6 → testsuites/basic/test.log.6 b/interoperability/testsuites/basic/test.log.6 → testsuites/basic/test.log.6
diff --git a/interoperability/testsuites/basic/test.log.7 → testsuites/basic/test.log.7 b/interoperability/testsuites/basic/test.log.7 → testsuites/basic/test.log.7
diff --git a/interoperability/testsuites/basic/test.log.8 → testsuites/basic/test.log.8 b/interoperability/testsuites/basic/test.log.8 → testsuites/basic/test.log.8
diff --git a/interoperability/testsuites/basic/test.log.9 → testsuites/basic/test.log.9 b/interoperability/testsuites/basic/test.log.9 → testsuites/basic/test.log.9
diff --git a/interoperability/tls_testing/keys/all-ca.crt → tls_testing/keys/all-ca.crt b/interoperability/tls_testing/keys/all-ca.crt → tls_testing/keys/all-ca.crt
diff --git a/...y/tls_testing/keys/server/server-mitm.crt → tls_testing/keys/server/server-mitm.crt b/...y/tls_testing/keys/server/server-mitm.crt → tls_testing/keys/server/server-mitm.crt
diff --git a/...y/tls_testing/keys/server/server-mitm.key → tls_testing/keys/server/server-mitm.key b/...y/tls_testing/keys/server/server-mitm.key → tls_testing/keys/server/server-mitm.key
diff --git a/...bility/tls_testing/keys/server/server.crt → tls_testing/keys/server/server.crt b/...bility/tls_testing/keys/server/server.crt → tls_testing/keys/server/server.crt
diff --git a/...bility/tls_testing/keys/server/server.key → tls_testing/keys/server/server.key b/...bility/tls_testing/keys/server/server.key → tls_testing/keys/server/server.key
diff --git a/...ability/tls_testing/keys/test-root-ca.crt → tls_testing/keys/test-root-ca.crt b/...ability/tls_testing/keys/test-root-ca.crt → tls_testing/keys/test-root-ca.crt
diff --git a/...lity/tls_testing/keys/test-signing-ca.crt → tls_testing/keys/test-signing-ca.crt b/...lity/tls_testing/keys/test-signing-ca.crt → tls_testing/keys/test-signing-ca.crt
diff --git a/interoperability/tls_testing/ssl/all-ca.crt → tls_testing/ssl/all-ca.crt b/interoperability/tls_testing/ssl/all-ca.crt → tls_testing/ssl/all-ca.crt
diff --git a/...bility/tls_testing/ssl/client-expired.crt → tls_testing/ssl/client-expired.crt b/...bility/tls_testing/ssl/client-expired.crt → tls_testing/ssl/client-expired.crt
diff --git a/...bility/tls_testing/ssl/client-expired.csr → tls_testing/ssl/client-expired.csr b/...bility/tls_testing/ssl/client-expired.csr → tls_testing/ssl/client-expired.csr
diff --git a/...bility/tls_testing/ssl/client-revoked.crt → tls_testing/ssl/client-revoked.crt b/...bility/tls_testing/ssl/client-revoked.crt → tls_testing/ssl/client-revoked.crt
diff --git a/...bility/tls_testing/ssl/client-revoked.csr → tls_testing/ssl/client-revoked.csr b/...bility/tls_testing/ssl/client-revoked.csr → tls_testing/ssl/client-revoked.csr
diff --git a/...bility/tls_testing/ssl/client-revoked.key → tls_testing/ssl/client-revoked.key b/...bility/tls_testing/ssl/client-revoked.key → tls_testing/ssl/client-revoked.key
diff --git a/interoperability/tls_testing/ssl/client.crt → tls_testing/ssl/client.crt b/interoperability/tls_testing/ssl/client.crt → tls_testing/ssl/client.crt
diff --git a/interoperability/tls_testing/ssl/client.csr → tls_testing/ssl/client.csr b/interoperability/tls_testing/ssl/client.csr → tls_testing/ssl/client.csr
diff --git a/interoperability/tls_testing/ssl/client.key → tls_testing/ssl/client.key b/interoperability/tls_testing/ssl/client.key → tls_testing/ssl/client.key
diff --git a/interoperability/tls_testing/ssl/client.pem → tls_testing/ssl/client.pem b/interoperability/tls_testing/ssl/client.pem → tls_testing/ssl/client.pem
diff --git a/interoperability/tls_testing/ssl/crl.pem → tls_testing/ssl/crl.pem b/interoperability/tls_testing/ssl/crl.pem → tls_testing/ssl/crl.pem
diff --git a/interoperability/tls_testing/ssl/openssl.cnf → tls_testing/ssl/openssl.cnf b/interoperability/tls_testing/ssl/openssl.cnf → tls_testing/ssl/openssl.cnf
diff --git a/...bility/tls_testing/ssl/server-expired.csr → tls_testing/ssl/server-expired.csr b/...bility/tls_testing/ssl/server-expired.csr → tls_testing/ssl/server-expired.csr
diff --git a/interoperability/tls_testing/ssl/server.crt → tls_testing/ssl/server.crt b/interoperability/tls_testing/ssl/server.crt → tls_testing/ssl/server.crt
diff --git a/interoperability/tls_testing/ssl/server.csr → tls_testing/ssl/server.csr b/interoperability/tls_testing/ssl/server.csr → tls_testing/ssl/server.csr
diff --git a/interoperability/tls_testing/ssl/server.key → tls_testing/ssl/server.key b/interoperability/tls_testing/ssl/server.key → tls_testing/ssl/server.key
diff --git a/...erability/tls_testing/ssl/test-alt-ca.crt → tls_testing/ssl/test-alt-ca.crt b/...erability/tls_testing/ssl/test-alt-ca.crt → tls_testing/ssl/test-alt-ca.crt
diff --git a/...erability/tls_testing/ssl/test-alt-ca.csr → tls_testing/ssl/test-alt-ca.csr b/...erability/tls_testing/ssl/test-alt-ca.csr → tls_testing/ssl/test-alt-ca.csr
diff --git a/...erability/tls_testing/ssl/test-alt-ca.key → tls_testing/ssl/test-alt-ca.key b/...erability/tls_testing/ssl/test-alt-ca.key → tls_testing/ssl/test-alt-ca.key
diff --git a/...lity/tls_testing/ssl/test-bad-root-ca.crt → tls_testing/ssl/test-bad-root-ca.crt b/...lity/tls_testing/ssl/test-bad-root-ca.crt → tls_testing/ssl/test-bad-root-ca.crt
diff --git a/...lity/tls_testing/ssl/test-bad-root-ca.key → tls_testing/ssl/test-bad-root-ca.key b/...lity/tls_testing/ssl/test-bad-root-ca.key → tls_testing/ssl/test-bad-root-ca.key
diff --git a/...ity/tls_testing/ssl/test-fake-root-ca.crt → tls_testing/ssl/test-fake-root-ca.crt b/...ity/tls_testing/ssl/test-fake-root-ca.crt → tls_testing/ssl/test-fake-root-ca.crt
diff --git a/...ity/tls_testing/ssl/test-fake-root-ca.key → tls_testing/ssl/test-fake-root-ca.key b/...ity/tls_testing/ssl/test-fake-root-ca.key → tls_testing/ssl/test-fake-root-ca.key
diff --git a/...rability/tls_testing/ssl/test-root-ca.crt → tls_testing/ssl/test-root-ca.crt b/...rability/tls_testing/ssl/test-root-ca.crt → tls_testing/ssl/test-root-ca.crt
diff --git a/...rability/tls_testing/ssl/test-root-ca.key → tls_testing/ssl/test-root-ca.key b/...rability/tls_testing/ssl/test-root-ca.key → tls_testing/ssl/test-root-ca.key
diff --git a/...ility/tls_testing/ssl/test-signing-ca.crt → tls_testing/ssl/test-signing-ca.crt b/...ility/tls_testing/ssl/test-signing-ca.crt → tls_testing/ssl/test-signing-ca.crt
diff --git a/...ility/tls_testing/ssl/test-signing-ca.csr → tls_testing/ssl/test-signing-ca.csr b/...ility/tls_testing/ssl/test-signing-ca.csr → tls_testing/ssl/test-signing-ca.csr
diff --git a/...ility/tls_testing/ssl/test-signing-ca.key → tls_testing/ssl/test-signing-ca.key b/...ility/tls_testing/ssl/test-signing-ca.key → tls_testing/ssl/test-signing-ca.key
diff --git a/interoperability/udp.conf → udp.conf b/interoperability/udp.conf → udp.conf