signer: fix rebase issues in aws_signer

- update SSlibKey import - use new compute_default_keyid Signed-off-by: Lukas Puehringer <[email protected]>
secure-systems-lab · Aug 10, 2023 · 3951fed · 3951fed
1 parent 9ddde6d
commit 3951fed
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/securesystemslib/signer/_aws_signer.py b/securesystemslib/signer/_aws_signer.py
@@ -7,13 +7,9 @@
 import securesystemslib.hash as sslib_hash
 from securesystemslib import exceptions
 from securesystemslib.exceptions import UnsupportedLibraryError
-from securesystemslib.signer._key import Key
-from securesystemslib.signer._signer import (
-    SecretsHandler,
-    Signature,
-    Signer,
-    SSlibKey,
-)
+from securesystemslib.signer._key import Key, SSlibKey
+from securesystemslib.signer._signer import SecretsHandler, Signature, Signer
+from securesystemslib.signer._utils import compute_default_keyid
 
 logger = logging.getLogger(__name__)
 
@@ -127,7 +123,7 @@ def import_(cls, aws_key_id: str, local_scheme: str) -> Tuple[str, Key]:
             ) from e
 
         keyval = {"public": public_key_pem}
-        keyid = cls._get_keyid(keytype, local_scheme, keyval)
+        keyid = compute_default_keyid(keytype, local_scheme, keyval)
         public_key = SSlibKey(keyid, keytype, local_scheme, keyval)
         return f"{cls.SCHEME}:{aws_key_id}", public_key