Ensure all code paths can be tested for both curve and q structs.

oarepo · Dec 13, 2024 · e955ace · e955ace
1 parent 6920910
commit e955ace
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/oarepo_c4gh/key/gpg_agent.py b/oarepo_c4gh/key/gpg_agent.py
@@ -163,15 +163,15 @@ def ensure_public_key(self):
                 curve_struct = next(
                     v for v in key_struct[1][1:] if v[0] == b"curve"
                 )
+                q_struct = next(v for v in key_struct[1][1:] if v[0] == b"q")
                 if (
                     (curve_struct is None)
                     or (len(curve_struct) < 2)
                     or (curve_struct[1] != b"Curve25519")
+                    or (q_struct is None)
+                    or (len(q_struct) < 2)
                 ):
                     continue
-                q_struct = next(v for v in key_struct[1][1:] if v[0] == b"q")
-                if (q_struct is None) or (len(q_struct) < 2):
-                    continue
                 self._public_key = q_struct[1][1:]
                 self._keygrip = keygrip
                 break