Removed unused conditional function, removed "NT" from windows version so it matches SMB enumeration

nxc/protocols/winrm.py

@@ -54,7 +54,7 @@ class winrm(connection):
         ntlm_info = parse_challenge(base64.b64decode(self.challenge_header.split(" ")[1].replace(",", "")))
         self.domain = ntlm_info["target_info"]["MsvAvDnsDomainName"]
         self.hostname = ntlm_info["target_info"]["MsvAvNbComputerName"]
-        self.server_os = f'Windows NT {ntlm_info["version"]}'
+        self.server_os = f'Windows {ntlm_info["version"]}'
         self.logger.extra["hostname"] = self.hostname
 
         self.output_filename = os.path.expanduser(f"~/.nxc/logs/{self.hostname}_{self.host}_{datetime.now().strftime('%Y-%m-%d_%H%M%S')}")

nxc/protocols/winrm/proto_args.py

@@ -24,18 +24,3 @@ def proto_args(parser, std_parser, module_parser):
     cgroup.add_argument("-X", metavar="PS_COMMAND", dest="ps_execute", help="execute the specified PowerShell command")
 
     return parser
-
-
-def get_conditional_action(baseAction):
-    class ConditionalAction(baseAction):
-        def __init__(self, option_strings, dest, **kwargs):
-            x = kwargs.pop("make_required", [])
-            super().__init__(option_strings, dest, **kwargs)
-            self.make_required = x
-
-        def __call__(self, parser, namespace, values, option_string=None):
-            for x in self.make_required:
-                x.required = True
-            super().__call__(parser, namespace, values, option_string)
-
-    return ConditionalAction

nxc/protocols/winrm/winrm_ntlm_parser.py

@@ -13,7 +13,7 @@ def parse_version(version_bytes):
     major_version = version_bytes[0]
     minor_version = version_bytes[1]
     product_build = decoder(version_bytes[2:4], "int")
-    return f"{major_version}.{minor_version}.{product_build}"
+    return f"{major_version}.{minor_version} Build {product_build}"
 
 def parse_target_info(target_info_bytes):
     MsvAvEOL = 0x0000