support ChaCha64 encryption

nakagami · Jan 17, 2025 · c3c0450 · c3c0450
1 parent 11a2f03
commit c3c0450
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/firebirdsql/fbcore.py b/firebirdsql/fbcore.py
@@ -761,15 +761,15 @@ def _parse_connect_response(self):
 
             if enc_plugin and self.wire_crypt and session_key:
                 self._op_crypt(enc_plugin)
-                if enc_plugin == b'Arc4':
-                    self.sock.set_translator(
-                        ARC4.new(session_key), ARC4.new(session_key))
-                elif enc_plugin == b'ChaCha':
+                if enc_plugin in (b'ChaCha64', b'ChaCha'):
                     k = hashlib.sha256(session_key).digest()
                     self.sock.set_translator(
                         ChaCha20.new(k, nonce),
                         ChaCha20.new(k, nonce),
                     )
+                elif enc_plugin == b'Arc4':
+                    self.sock.set_translator(
+                        ARC4.new(session_key), ARC4.new(session_key))
                 else:
                     raise OperationalError(
                         'Unknown wirecrypt plugin %s' % (enc_plugin)

diff --git a/firebirdsql/utils.py b/firebirdsql/utils.py
@@ -185,10 +185,10 @@ def guess_wire_crypt(b):
         elif t == 3:
             plugin_nonce.append(v)
 
-#    if b'ChaCha64' in available_plugins:
-#        for s in plugin_nonce:
-#            if s[:9] == b"ChaCha64\x00":
-#                return (b'ChaCha64', s[9:])
+    if b'ChaCha64' in available_plugins:
+        for s in plugin_nonce:
+            if s[:9] == b"ChaCha64\x00":
+                return (b'ChaCha64', s[9:])
     if b'ChaCha' in available_plugins:
         for s in plugin_nonce:
             if s[:7] == b"ChaCha\x00":