more fix

Author: lucasmcdonald3

src/aws_encryption_sdk/internal/utils/__init__.py

@@ -115,7 +115,6 @@ def prepare_data_keys(primary_master_key, master_keys, algorithm, encryption_con
     encrypted_data_encryption_key = None
     data_encryption_key = primary_master_key.generate_data_key(algorithm, encryption_context)
     _LOGGER.debug("encryption data generated with master key: %s", data_encryption_key.key_provider)
-    input(f"{master_keys=}")
     for master_key in master_keys:
         # Don't re-encrypt the encryption data key; we already have the ciphertext
         if master_key is primary_master_key:
@@ -129,8 +128,6 @@ def prepare_data_keys(primary_master_key, master_keys, algorithm, encryption_con
         )
         encrypted_data_keys.add(encrypted_key)
         _LOGGER.debug("encryption key encrypted with master key: %s", master_key.key_provider)
-    input(f"{data_encryption_key=}")
-    input(f"{encrypted_data_keys=}")
     return data_encryption_key, encrypted_data_keys
 
 

test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py

@@ -168,7 +168,6 @@ def run(self, materials_manager=None):
         else:
             raise TypeError(f"Unrecognized master_key_provider_fn return type: {self.master_key_provider_fn()}")
         ciphertext, _header = client.encrypt(**encrypt_kwargs)
-        input(f"{_header=}")
         return ciphertext
 
 

test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py

@@ -109,7 +109,6 @@ def keyring(self, keys_uri, mode):
             if input_kwargs["key"] == "rsa-4096-private" \
                     and mode in ("decrypt-generate", "encrypt"):
                 changed_key_name_from_private_to_public = True
-                input("YUP")
                 input_kwargs["key"] = "rsa-4096-public"
             # Specify default padding-hash
             if "padding-hash" not in input_kwargs:
@@ -124,8 +123,6 @@ def keyring(self, keys_uri, mode):
             GetKeyDescriptionInput(json=encoded_json)
         )
 
-        input(f"{output.key_description=}")
-
         keyring: IKeyring = keyvectors.create_test_vector_keyring(
             TestVectorKeyringInput(
                 key_description=output.key_description
@@ -162,13 +159,13 @@ def keyring(self, keys_uri, mode):
         # This configuration seems to be correct, because
         # all of the test vectors (master keys and MPL) pass with these two hacks.
         # But this seems weird, and we didn't have to do this in Java.
-        # if hasattr(keyring, "_impl"):  # pylint: disable=protected-access
-        #     if hasattr(keyring._impl, "_keyName"):  # pylint: disable=protected-access
-        #         if keyring._impl._keyName == UTF8.default__.Encode(_dafny.Seq("rsa-4096-public")).value \
-        #                 and mode in ("decrypt-generate", "encrypt"):  # pylint: disable=protected-access
-        #             if changed_key_name_from_private_to_public:
-        #                 # pylint: disable=protected-access
-        #                 keyring._impl._keyName = UTF8.default__.Encode(_dafny.Seq("rsa-4096-private")).value
+        if hasattr(keyring, "_impl"):  # pylint: disable=protected-access
+            if hasattr(keyring._impl, "_keyName"):  # pylint: disable=protected-access
+                if keyring._impl._keyName == UTF8.default__.Encode(_dafny.Seq("rsa-4096-public")).value \
+                        and mode in ("decrypt-generate", "encrypt"):  # pylint: disable=protected-access
+                    if changed_key_name_from_private_to_public:
+                        # pylint: disable=protected-access
+                        keyring._impl._keyName = UTF8.default__.Encode(_dafny.Seq("rsa-4096-private")).value
 
         return keyring
 
@@ -201,9 +198,7 @@ def keyring_from_master_key_specs(keys_uri, master_key_specs, mode):
     """
     keyrings = [spec.keyring(keys_uri, mode) for spec in master_key_specs]
     primary = keyrings[0]
-    input(f"{primary=}")
     others = keyrings[1:]
-    input(f"{others=}")
 
     mpl: AwsCryptographicMaterialProviders = AwsCryptographicMaterialProviders(
         MaterialProvidersConfig()