🔧 update default supported signature algorithms (certificate)

jawah · Sep 20, 2024 · 260369a · 260369a
1 parent dee87f4
commit 260369a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -17,6 +17,7 @@
 - Backport "Limit the number of pending connection IDs marked for retirement." https://github.com/aiortc/aioquic/commit/4f73f18a23c22f48ef43cb3629b0686757f096af
 - Backport "During address validation, count the entire received datagram" https://github.com/aiortc/aioquic/commit/afe5525822f71e277e534b08f198ec8724a7ad59
 - Update aws-lc-rs v1.8.1 to v1.9.0
+- Default supported signature algorithms to: ``ECDSA_SECP256R1_SHA256, RSA_PSS_RSAE_SHA256, RSA_PKCS1_SHA256, ECDSA_SECP384R1_SHA384, RSA_PSS_RSAE_SHA384, RSA_PKCS1_SHA384, RSA_PSS_RSAE_SHA512, RSA_PKCS1_SHA512, ED25519``.
 
 **Fixed**
 - Certificate fingerprint matching.

diff --git a/qh3/tls.py b/qh3/tls.py
@@ -503,7 +503,7 @@ class SignatureAlgorithm(IntEnum):
     ECDSA_SECP384R1_SHA384 = 0x0503
     ECDSA_SECP521R1_SHA512 = 0x0603
     ED25519 = 0x0807
-    ED448 = 0x0808
+    ED448 = 0x0808  # unsupported
     RSA_PKCS1_SHA256 = 0x0401
     RSA_PKCS1_SHA384 = 0x0501
     RSA_PKCS1_SHA512 = 0x0601
@@ -1341,10 +1341,14 @@ def __init__(
         self._legacy_compression_methods: list[int] = [CompressionMethod.NULL]
         self._psk_key_exchange_modes: list[int] = [PskKeyExchangeMode.PSK_DHE_KE]
         self._signature_algorithms: list[int] = [
-            SignatureAlgorithm.RSA_PSS_RSAE_SHA256,
             SignatureAlgorithm.ECDSA_SECP256R1_SHA256,
+            SignatureAlgorithm.RSA_PSS_RSAE_SHA256,
             SignatureAlgorithm.RSA_PKCS1_SHA256,
             SignatureAlgorithm.ECDSA_SECP384R1_SHA384,
+            SignatureAlgorithm.RSA_PSS_RSAE_SHA384,
+            SignatureAlgorithm.RSA_PKCS1_SHA384,
+            SignatureAlgorithm.RSA_PSS_RSAE_SHA512,
+            SignatureAlgorithm.RSA_PKCS1_SHA512,
             SignatureAlgorithm.ED25519,
         ]
 
@@ -1354,7 +1358,6 @@ def __init__(
             Group.X25519,
             Group.SECP256R1,
             Group.SECP384R1,
-            # Group.SECP521R1, not used by default, but we can serve it.
         ]
 
         self._supported_versions = [TLS_VERSION_GREASE, TLS_VERSION_1_3]

diff --git a/tests/test_connection.py b/tests/test_connection.py
@@ -2612,7 +2612,7 @@ def test_send_max_data_blocked_by_cc(self):
             # check congestion control
             self.assertEqual(client._loss.bytes_in_flight, 0)
             self.assertGreaterEqual(client._loss.congestion_window, 13530)
-            self.assertLessEqual(client._loss.congestion_window, 15650)
+            self.assertLessEqual(client._loss.congestion_window, 16000)
 
             # artificially raise received data counter
             client._local_max_data_used = client._local_max_data