Make registry_layers -> registry_layer for consistency

Author: dgmcdona

volatility3/framework/plugins/windows/registry/lsadump.py

@@ -11,7 +11,7 @@
 from volatility3.framework import interfaces, renderers, exceptions
 from volatility3.framework.configuration import requirements
 
-from volatility3.framework.layers import registry as registry_layers
+from volatility3.framework.layers import registry as registry_layer
 from volatility3.framework.symbols.windows import versions
 from volatility3.plugins.windows.registry import hashdump, hivelist
 from volatility3.framework.renderers import format_hints
@@ -64,7 +64,7 @@ def decrypt_aes(cls, secret: bytes, key: bytes) -> bytes:
 
     @classmethod
     def get_lsa_key(
-        cls, sechive: registry_layers.RegistryHive, bootkey: bytes, vista_or_later: bool
+        cls, sechive: registry_layer.RegistryHive, bootkey: bytes, vista_or_later: bool
     ) -> Optional[bytes]:
         if not bootkey:
             return None
@@ -108,7 +108,7 @@ def get_lsa_key(
     @classmethod
     def get_secret_by_name(
         cls,
-        sechive: registry_layers.RegistryHive,
+        sechive: registry_layer.RegistryHive,
         name: str,
         lsakey: bytes,
         is_vista_or_later: bool,
@@ -123,7 +123,7 @@ def get_secret_by_name(
                 enc_secret_value = next(enc_secret_key.get_values(), None)
             except (
                 exceptions.InvalidAddressException,
-                registry_layers.RegistryException,
+                registry_layer.RegistryException,
             ):
                 enc_secret_value = None
 
@@ -171,8 +171,8 @@ def decrypt_secret(cls, secret: bytes, key: bytes) -> bytes:
 
     def _generator(
         self,
-        syshive: registry_layers.RegistryHive,
-        sechive: registry_layers.RegistryHive,
+        syshive: registry_layer.RegistryHive,
+        sechive: registry_layer.RegistryHive,
     ):
         kernel = self.context.modules[self.config["kernel"]]
 
@@ -208,7 +208,7 @@ def _generator(
             except (
                 StopIteration,
                 exceptions.InvalidAddressException,
-                registry_layers.RegistryException,
+                registry_layer.RegistryException,
             ):
                 enc_secret_value = None
 
@@ -231,7 +231,7 @@ def _generator(
                 key_name = key.get_name()
             except (
                 exceptions.InvalidAddressException,
-                registry_layers.RegistryException,
+                registry_layer.RegistryException,
             ):
                 key_name = renderers.UnreadableValue()
 

volatility3/framework/plugins/windows/registry/userassist.py

@@ -13,7 +13,7 @@
 from volatility3.framework import constants, exceptions, interfaces, renderers
 from volatility3.framework.configuration import requirements
 from volatility3.framework.layers import physical
-from volatility3.framework.layers import registry as registry_layers
+from volatility3.framework.layers import registry as registry_layer
 from volatility3.framework.renderers import conversion, format_hints
 from volatility3.framework.symbols import intermed
 from volatility3.plugins.windows.registry import hivelist
@@ -155,7 +155,7 @@ def _win7_or_later(self) -> bool:
         ).has_member("CookiePad")
 
     def list_userassist(
-        self, hive: registry_layers.RegistryHive
+        self, hive: registry_layer.RegistryHive
     ) -> Generator[Tuple[int, Tuple], None, None]:
         """Generate userassist data for a registry hive."""
 
@@ -177,7 +177,7 @@ def list_userassist(
                 "software\\microsoft\\windows\\currentversion\\explorer\\userassist",
                 return_list=True,
             )
-        except registry_layers.RegistryException as e:
+        except registry_layer.RegistryException as e:
             vollog.warning(
                 f"Error accessing UserAssist key in {hive_name} at {hive.hive_offset:#x}: {e}"
             )
@@ -247,7 +247,7 @@ def list_userassist(
                         subkey_name = subkey.get_name()
                     except (
                         exceptions.InvalidAddressException,
-                        registry_layers.RegistryException,
+                        registry_layer.RegistryException,
                     ):
                         subkey_name = renderers.UnreadableValue()
 
@@ -276,7 +276,7 @@ def list_userassist(
                         value_name = value.get_name()
                     except (
                         exceptions.InvalidAddressException,
-                        registry_layers.RegistryException,
+                        registry_layer.RegistryException,
                     ):
                         value_name = renderers.UnreadableValue()