ruby_smb 2.0.11 → 3.0.1

data/lib/ruby_smb/dcerpc/srvsvc/net_share_enum_all.rb

@@ -2,103 +2,80 @@ module RubySMB
   module Dcerpc
     module Srvsvc
 
-      #https://msdn.microsoft.com/en-us/library/cc247293.aspx
+      # [2.2.1.1 SRVSVC_HANDLE](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-srvs/5f8329ee-1965-4ea1-ad35-3b29fbb63232)
+      class SrvsvcHandle < Ndr::NdrWideStringzPtr; end
 
-      class NetShareEnumAll < BinData::Record
-        attr_reader :opnum
+      # [2.2.4.23 SHARE_INFO_1](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-srvs/fc69f110-998d-4c16-9667-514e22fdd80b)
+      class ShareInfo1Element < Ndr::NdrStruct
+        default_parameters byte_align: 4
 
-        mandatory_parameter :host
+        ndr_wide_stringz_ptr :shi1_netname
+        ndr_uint32           :shi1_type
+        ndr_wide_stringz_ptr :shi1_remark
+      end
 
-        endian :little
+      class ShareInfo1 < Ndr::NdrConfArray
+        default_parameters type: :share_info1_element
+      end
 
-        uint32    :referent_id,  initial_value: 0x00000001
-        uint32    :max_count,    initial_value: -> { server_unc.do_num_bytes / 2 }
-        uint32    :offset,       initial_value: 0
-        uint32    :actual_count, initial_value: -> {max_count}
-        stringz16 :server_unc,   pad_front: false, read_length: -> { actual_count * 2 },
-                                 initial_value: -> {"\\\\#{host.encode('utf-8')}".encode('utf-16le')}
+      class LpshareInfo1 < ShareInfo1
+        extend Ndr::PointerClassPlugin
+      end
 
-        string :pad,             length: lambda { pad_length }
-        uint32 :level,           initial_value: 1
+      # [2.2.4.33 SHARE_INFO_1_CONTAINER](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-srvs/919abd5d-87d9-4ffa-b4b1-632a66053bc6)
+      class ShareInfo1Container < Ndr::NdrStruct
+        default_parameters byte_align: 4
 
-        uint32 :ctr,             initial_value: 1
-        uint32 :ctr_referent_id, initial_value: 0x00000001
-        uint32 :ctr_count,       initial_value: 0
-        uint32 :pointer_to_array, initial_value: 0
+        ndr_uint32    :entries_read
+        lpshare_info1 :buffer
+      end
 
-        uint32 :max_buffer,       initial_value: 4294967295
+      class LpshareInfo1Container < ShareInfo1Container
+        extend Ndr::PointerClassPlugin
+      end
 
-        uint32 :resume_referent_id, initial_value: 0x00000001
-        uint32 :resume_handle,    initial_value: 0
+      # [2.2.4.38 SHARE_ENUM_STRUCT](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-srvs/79ee052e-e16b-4ec5-b4b7-e99777c26eca)
+      class LpshareEnumStruct < Ndr::NdrStruct
+        hide :switch_value
+        default_parameters byte_align: 4
 
-        def initialize_instance
-          super
-          @opnum = NET_SHARE_ENUM_ALL
-        end
-
-        def pad_length
-          offset = (server_unc.abs_offset + server_unc.to_binary_s.length) % 4
-          (4 - offset) % 4
+        ndr_uint32 :level, initial_value: 1
+        ndr_uint32 :switch_value, initial_value: :level
+        choice :share_info, selection: :level, byte_align: 4 do
+          lpshare_info1_container 1, initial_value: { entries_read: 0, buffer: :null }
         end
+      end
 
-        def self.parse_response(response)
-
-          shares = []
-
-          res = response.dup
-          win_error = res.slice!(-4, 4).unpack("V")[0]
-
-          if win_error != 0
-            raise RuntimeError, "Invalid DCERPC response: win_error = #{win_error}"
-          end
-
-          # Remove unused data
-          res.slice!(0, 12) # level, CTR header, Reference ID of CTR
-          share_count = res.slice!(0, 4).unpack("V")[0]
-          res.slice!(0, 4) # Reference ID of CTR1
-          share_max_count = res.slice!(0, 4).unpack("V")[0]
-
-          if share_max_count != share_count
-            raise RuntimeError, "Invalid DCERPC response: count != count max (#{share_count}/#{share_max_count})"
-          end
-
-          # ReferenceID / Type / ReferenceID of Comment
-          types = res.slice!(0, share_count * 12).scan(/.{12}/n).map { |a| a[4, 2].unpack("v")[0] }
-
-          share_count.times do |t|
-            length, offset, max_length = res.slice!(0, 12).unpack("VVV")
-            if offset != 0
-              raise RuntimeError, "Invalid DCERPC response: offset != 0 (#{offset})"
-            end
-
-            if length != max_length
-              raise RuntimeError, "Invalid DCERPC response: length !=max_length (#{length}/#{max_length})"
-            end
-            name = res.slice!(0, 2 * length).gsub('\x00', '')
-            res.slice!(0, 2) if length % 2 == 1 # pad
-
-            comment_length, comment_offset, comment_max_length = res.slice!(0, 12).unpack("VVV")
+      # [3.1.4.8 NetrShareEnum (Opnum 15)](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-srvs/c4a98e7b-d416-439c-97bd-4d9f52f8ba52)
+      class NetShareEnumAllRequest < BinData::Record
+        attr_reader :opnum
 
-            if comment_offset != 0
-              raise RuntimeError, "Invalid DCERPC response: comment_offset != 0 (#{comment_offset})"
-            end
+        endian :little
 
-            if comment_length != comment_max_length
-              raise RuntimeError, "Invalid DCERPC response: comment_length != comment_max_length (#{comment_length}/#{comment_max_length})"
-            end
+        srvsvc_handle       :server_name
+        lpshare_enum_struct :info_struct
+        ndr_uint32          :prefered_maximum_length, initial_value: 0xFFFFFFFF
+        ndr_uint32_ptr      :resume_handle, initial_value: 0
 
-            comment = res.slice!(0, 2 * comment_length)
+        def initialize_instance
+          super
+          @opnum = NET_SHARE_ENUM_ALL
+        end
+      end
 
-            res.slice!(0, 2) if comment_length % 2 == 1 # pad
+      class NetShareEnumAllResponse < BinData::Record
+        attr_reader :opnum
 
-            name = name.gsub("\x00", "")
-            s_type = ['DISK', 'PRINTER', 'DEVICE', 'IPC', 'SPECIAL', 'TEMPORARY'][types[t]].gsub("\x00", "")
-            comment = comment.gsub("\x00", "")
+        endian :little
 
-            shares << [name, s_type, comment]
-          end
+        lpshare_enum_struct :info_struct
+        ndr_uint32          :total_entries
+        ndr_uint32_ptr      :resume_handle
+        ndr_uint32          :error_status
 
-          shares
+        def initialize_instance
+          super
+          @opnum = NET_SHARE_ENUM_ALL
         end
       end
     end

data/lib/ruby_smb/dcerpc/srvsvc.rb

@@ -9,16 +9,39 @@ module RubySMB
       # Operation numbers
       NET_SHARE_ENUM_ALL = 0xF
 
+      # [2.2.2.4 Share Types](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-srvs/6069f8c0-c93f-43a0-a5b4-7ed447eb4b84)
+      SHARE_TYPES = {
+        0x00000000 => 'DISK',
+        0x00000001 => 'PRINTER',
+        0x00000002 => 'DEVICE',
+        0x00000003 => 'IPC',
+        0x02000000 => 'CLUSTER_FS',
+        0x04000000 => 'CLUSTER_SOFS',
+        0x08000000 => 'CLUSTER_DFS'
+      }
+      STYPE_SPECIAL = 0x80000000
+      STYPE_TEMPORARY = 0x40000000
+
       require 'ruby_smb/dcerpc/srvsvc/net_share_enum_all'
 
       def net_share_enum_all(host)
+        host = "\\\\#{host}" unless host.start_with?('\\\\')
         bind(endpoint: RubySMB::Dcerpc::Srvsvc)
 
-        net_share_enum_all_request_packet = RubySMB::Dcerpc::Srvsvc::NetShareEnumAll.new(host: host)
-        response = dcerpc_request(net_share_enum_all_request_packet)
+        net_share_enum_all_request_packet = RubySMB::Dcerpc::Srvsvc::NetShareEnumAllRequest.new(server_name: host)
+        raw_response = dcerpc_request(net_share_enum_all_request_packet)
 
-        shares = RubySMB::Dcerpc::Srvsvc::NetShareEnumAll.parse_response(response)
-        shares.map{|s|{name: s[0], type: s[1], comment: s[2]}}
+        response = RubySMB::Dcerpc::Srvsvc::NetShareEnumAllResponse.read(raw_response)
+        response.info_struct.share_info.buffer.map do |share|
+          type = [SHARE_TYPES[share.shi1_type & 0x0FFFFFFF]]
+          type << 'SPECIAL' unless share.shi1_type & STYPE_SPECIAL == 0
+          type << 'TEMPORARY' unless share.shi1_type & STYPE_TEMPORARY == 0
+          {
+            name: share.shi1_netname.encode('UTF-8'),
+            type: type.join('|'),
+            comment: share.shi1_remark.encode('UTF-8')
+          }
+        end
       end
     end
   end

data/lib/ruby_smb/dcerpc/svcctl/change_service_config_w_request.rb

@@ -10,36 +10,24 @@ module RubySMB
 
         endian :little
 
-        sc_rpc_handle :h_service
-        uint32        :dw_service_type
-        uint32        :dw_start_type
-        uint32        :dw_error_control
-        ndr_lp_str    :lp_binary_path_name
-        string        :pad1, length: -> { pad_length(self.lp_binary_path_name) }
-        ndr_lp_str    :lp_load_order_group
-        string        :pad2, length: -> { pad_length(self.lp_load_order_group) }
-        ndr_lp_dword  :dw_tag_id
-        ndr_lp_byte   :lp_dependencies
-        string        :pad3, length: -> { pad_length(self.lp_dependencies) }
-        uint32        :dw_depend_size, value: -> { self.lp_dependencies.max_count }
-        ndr_lp_str    :lp_service_start_name
-        string        :pad4, length: -> { pad_length(self.lp_service_start_name) }
-        ndr_lp_byte   :lp_password
-        string        :pad5, length: -> { pad_length(self.lp_password) }
-        uint32        :dw_pw_size, value: -> { self.lp_password.max_count }
-        ndr_lp_str    :lp_display_name
+        sc_rpc_handle       :h_service
+        ndr_uint32          :dw_service_type
+        ndr_uint32          :dw_start_type
+        ndr_uint32          :dw_error_control
+        ndr_wide_string_ptr :lp_binary_path_name
+        ndr_wide_string_ptr :lp_load_order_group
+        ndr_uint32_ptr      :dw_tag_id
+        ndr_conf_array      :lp_dependencies, type: :ndr_uint8
+        ndr_uint32          :dw_depend_size, value: -> { self.lp_dependencies.size }
+        ndr_wide_string_ptr :lp_service_start_name
+        ndr_conf_array      :lp_password, type: :ndr_uint8
+        ndr_uint32          :dw_pw_size, value: -> { self.lp_password.size }
+        ndr_wide_string_ptr :lp_display_name
 
         def initialize_instance
           super
           @opnum = CHANGE_SERVICE_CONFIG_W
         end
-
-        # Determines the correct length for the padding, so that the next
-        # field is 4-byte aligned.
-        def pad_length(prev_element)
-          offset = (prev_element.abs_offset + prev_element.to_binary_s.length) % 4
-          (4 - offset) % 4
-        end
       end
 
     end

data/lib/ruby_smb/dcerpc/svcctl/change_service_config_w_response.rb

@@ -10,8 +10,8 @@ module RubySMB
 
         endian :little
 
-        ndr_lp_dword :dw_tag_id
-        uint32       :error_status
+        ndr_uint32_ptr :dw_tag_id
+        ndr_uint32     :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/close_service_handle_response.rb

@@ -11,7 +11,7 @@ module RubySMB
         endian :little
 
         sc_rpc_handle :h_sc_object
-        uint32        :error_status
+        ndr_uint32    :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/control_service_request.rb

@@ -11,7 +11,7 @@ module RubySMB
         endian :little
 
         sc_rpc_handle :h_service
-        uint32        :dw_control
+        ndr_uint32    :dw_control
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/control_service_response.rb

@@ -11,7 +11,7 @@ module RubySMB
         endian :little
 
         service_status :lp_service_status
-        uint32         :error_status
+        ndr_uint32     :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_request.rb

@@ -2,7 +2,7 @@ module RubySMB
   module Dcerpc
     module Svcctl
 
-      class SvcctlHandleW < Ndr::NdrLpStr; end
+      class SvcctlHandleW < Ndr::NdrWideStringzPtr; end
 
       # [3.1.4.15 ROpenSCManagerW (Opnum 15)](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-scmr/dc84adb3-d51d-48eb-820d-ba1c6ca5faf2)
       class OpenSCManagerWRequest < BinData::Record
@@ -10,24 +10,14 @@ module RubySMB
 
         endian :little
 
-        svcctl_handle_w :lp_machine_name
-        string          :pad1, length: -> { pad_length(self.lp_machine_name) }
-        ndr_lp_str      :lp_database_name
-        string          :pad2, length: -> { pad_length(self.lp_database_name) }
-        uint32          :dw_desired_access
+        svcctl_handle_w      :lp_machine_name
+        ndr_wide_stringz_ptr :lp_database_name
+        ndr_uint32           :dw_desired_access
 
         def initialize_instance
           super
           @opnum = OPEN_SC_MANAGER_W
         end
-
-        # Determines the correct length for the padding, so that the next
-        # field is 4-byte aligned.
-        def pad_length(prev_element)
-          offset = (prev_element.abs_offset + prev_element.to_binary_s.length) % 4
-          (4 - offset) % 4
-        end
-
       end
 
     end

data/lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_response.rb

@@ -9,7 +9,7 @@ module RubySMB
         endian :little
 
         sc_rpc_handle :lp_sc_handle
-        uint32        :error_status
+        ndr_uint32    :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/open_service_w_request.rb

@@ -8,22 +8,14 @@ module RubySMB
 
         endian :little
 
-        sc_rpc_handle :lp_sc_handle
-        ndr_string    :lp_service_name
-        string        :pad, length: -> { pad_length(self.lp_service_name) }
-        uint32        :dw_desired_access
+        sc_rpc_handle             :lp_sc_handle
+        ndr_conf_var_wide_stringz :lp_service_name
+        ndr_uint32                :dw_desired_access
 
         def initialize_instance
           super
           @opnum = OPEN_SERVICE_W
         end
-
-        # Determines the correct length for the padding, so that the next
-        # field is 4-byte aligned.
-        def pad_length(prev_element)
-          offset = (prev_element.abs_offset + prev_element.to_binary_s.length) % 4
-          (4 - offset) % 4
-        end
       end
 
     end

data/lib/ruby_smb/dcerpc/svcctl/open_service_w_response.rb

@@ -9,7 +9,7 @@ module RubySMB
         endian :little
 
         sc_rpc_handle :lp_sc_handle
-        uint32        :error_status
+        ndr_uint32    :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/query_service_config_w_request.rb

@@ -9,7 +9,7 @@ module RubySMB
         endian :little
 
         sc_rpc_handle :h_service
-        uint32        :cb_buf_size
+        ndr_uint32    :cb_buf_size
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/query_service_config_w_response.rb

@@ -4,21 +4,22 @@ module RubySMB
   module Dcerpc
     module Svcctl
 
-      class LpBoundedDword8k < BinData::Uint32le; end
+      class LpBoundedDword8k < RubySMB::Dcerpc::Ndr::NdrUint32; end
 
       # [2.2.15 QUERY_SERVICE_CONFIGW](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-scmr/97200665-5631-42ea-9917-6f9b41f02391)
       class QueryServiceConfigW < RubySMB::Dcerpc::Ndr::NdrStruct
+        default_parameters byte_align: 4
         endian :little
 
-        uint32     :dw_service_type
-        uint32     :dw_start_type
-        uint32     :dw_error_control
-        ndr_lp_str :lp_binary_path_name
-        ndr_lp_str :lp_load_order_group
-        uint32     :dw_tag_id
-        ndr_lp_str :lp_dependencies
-        ndr_lp_str :lp_service_start_name
-        ndr_lp_str :lp_display_name
+        ndr_uint32          :dw_service_type
+        ndr_uint32          :dw_start_type
+        ndr_uint32          :dw_error_control
+        ndr_wide_string_ptr :lp_binary_path_name
+        ndr_wide_string_ptr :lp_load_order_group
+        ndr_uint32          :dw_tag_id
+        ndr_wide_string_ptr :lp_dependencies
+        ndr_wide_string_ptr :lp_service_start_name
+        ndr_wide_string_ptr :lp_display_name
 
       end
 
@@ -30,7 +31,7 @@ module RubySMB
 
         query_service_config_w :lp_service_config
         lp_bounded_dword8k     :pcb_bytes_needed
-        uint32                 :error_status
+        ndr_uint32             :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/query_service_status_response.rb

@@ -11,7 +11,7 @@ module RubySMB
         endian :little
 
         service_status :lp_service_status
-        uint32         :error_status
+        ndr_uint32     :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/service_status.rb

@@ -5,16 +5,17 @@ module RubySMB
     module Svcctl
 
       # [2.2.47 SERVICE_STATUS](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-scmr/4e91ff36-ab5f-49ed-a43d-a308e72b0b3c)
-      class ServiceStatus < BinData::Record
+      class ServiceStatus < Ndr::NdrStruct
+        default_parameter byte_align: 4
         endian :little
 
-        uint32 :dw_service_type
-        uint32 :dw_current_state
-        uint32 :dw_controls_accepted
-        uint32 :dw_win32_exit_code
-        uint32 :dw_service_specific_exit_code
-        uint32 :dw_check_point
-        uint32 :dw_wait_hint
+        ndr_uint32 :dw_service_type
+        ndr_uint32 :dw_current_state
+        ndr_uint32 :dw_controls_accepted
+        ndr_uint32 :dw_win32_exit_code
+        ndr_uint32 :dw_service_specific_exit_code
+        ndr_uint32 :dw_check_point
+        ndr_uint32 :dw_wait_hint
       end
 
     end

data/lib/ruby_smb/dcerpc/svcctl/start_service_w_request.rb

@@ -10,9 +10,9 @@ module RubySMB
 
         endian :little
 
-        sc_rpc_handle       :h_service
-        uint32              :argc
-        ndr_lp_string_ptrsw :argv
+        sc_rpc_handle  :h_service
+        ndr_uint32     :argc
+        ndr_conf_array :argv, type: :ndr_wide_string_ptr
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl/start_service_w_response.rb

@@ -10,7 +10,7 @@ module RubySMB
 
         endian :little
 
-        uint32 :error_status
+        ndr_uint32 :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/svcctl.rb

@@ -417,9 +417,7 @@ module RubySMB
         ss_request = StartServiceWRequest.new(h_service: svc_handle)
         unless argv.empty?
           ss_request.argc = argv.size
-          ndr_string_ptrsw = RubySMB::Dcerpc::Ndr::NdrStringPtrsw.new
-          ndr_string_ptrsw.elements = argv
-          ss_request.argv = ndr_string_ptrsw
+          ss_request.argv = argv
         end
         response = dcerpc_request(ss_request)
         begin

data/lib/ruby_smb/dcerpc/uuid.rb

@@ -3,6 +3,7 @@ module RubySMB
 
     # [Universal Unique Identifier](http://pubs.opengroup.org/onlinepubs/9629399/apdxa.htm)
     class Uuid < BinData::Primitive
+      default_parameter byte_align: 4
       endian :little
       uint32 :time_low,                  label: 'Low field of the timestamp'
       uint16 :time_mid,                  label: 'Middle field of the timestamp'
@@ -21,6 +22,8 @@ module RubySMB
       end
 
       def set(uuid_string)
+        uuid_string.delete_suffix!('}')
+        uuid_string.delete_prefix!('{')
         components = uuid_string.split('-')
         self.time_low.read(to_binary_le(components[0]))
         self.time_mid.read(to_binary_le(components[1]))

data/lib/ruby_smb/dcerpc/winreg/close_key_response.rb

@@ -11,8 +11,8 @@ module RubySMB
 
         endian :little
 
-        rpc_hkey  :hkey
-        uint32    :error_status
+        rpc_hkey   :hkey
+        ndr_uint32 :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/winreg/create_key_request.rb

@@ -45,28 +45,17 @@ module RubySMB
 
         rpc_hkey                 :hkey
         rrp_unicode_string       :lp_sub_key
-        string                   :pad1, length: -> { pad_length(self.lp_sub_key) }
         rrp_unicode_string       :lp_class
-        string                   :pad2, length: -> { pad_length(self.lp_class) }
-        uint32                   :dw_options
+        ndr_uint32               :dw_options
         regsam                   :sam_desired
         prpc_security_attributes :lp_security_attributes
-        string                   :pad3, length: -> { pad_length(self.lp_security_attributes) }
-        ndr_lp_dword             :lpdw_disposition
+        ndr_uint32_ptr           :lpdw_disposition
 
         def initialize_instance
           super
           @opnum = REG_CREATE_KEY
         end
-
-        # Determines the correct length for the padding, so that the next
-        # field is 4-byte aligned.
-        def pad_length(prev_element)
-          offset = (prev_element.abs_offset + prev_element.to_binary_s.length) % 4
-          (4 - offset) % 4
-        end
       end
-
     end
   end
 end

data/lib/ruby_smb/dcerpc/winreg/create_key_response.rb

@@ -17,9 +17,9 @@ module RubySMB
 
         endian :little
 
-        prpc_hkey    :hkey
-        ndr_lp_dword :lpdw_disposition
-        uint32       :error_status
+        prpc_hkey      :hkey
+        ndr_uint32_ptr :lpdw_disposition
+        ndr_uint32     :error_status
 
         def initialize_instance
           super

data/lib/ruby_smb/dcerpc/winreg/enum_key_request.rb

@@ -12,33 +12,16 @@ module RubySMB
         endian :little
 
         rpc_hkey            :hkey
-        uint32              :dw_index
-        rrp_unicode_string :lp_name
-        string              :pad1,     length: -> { pad_length1 }
+        ndr_uint32          :dw_index
+        rrp_unicode_string  :lp_name
         prrp_unicode_string :lp_class
-        string              :pad2,     length: -> { pad_length2 }
-        ndr_lp_file_time    :lpft_last_write_time
+        ndr_file_time_ptr   :lpft_last_write_time
 
         def initialize_instance
           super
           @opnum = REG_ENUM_KEY
         end
-
-        # Determines the correct length for the padding in front of
-        # #lp_class. It should always force a 4-byte alignment.
-        def pad_length1
-          offset = (lp_name.abs_offset + lp_name.to_binary_s.length) % 4
-          (4 - offset) % 4
-        end
-
-        # Determines the correct length for the padding in front of
-        # #lpft_last_write_time. It should always force a 4-byte alignment.
-        def pad_length2
-          offset = (lp_class.abs_offset + lp_class.to_binary_s.length) % 4
-          (4 - offset) % 4
-        end
       end
-
     end
   end
 end

data/lib/ruby_smb/dcerpc/winreg/enum_key_response.rb

@@ -10,32 +10,15 @@ module RubySMB
         endian :little
 
         rrp_unicode_string  :lp_name
-        string              :pad1,     length: -> { pad_length1 }
-        prrp_unicode_string :lp_class, initial_value: 0
-        string              :pad2,     length: -> { pad_length2 }
-        ndr_lp_file_time    :lpft_last_write_time
-        uint32              :error_status
+        prrp_unicode_string :lp_class
+        ndr_file_time_ptr   :lpft_last_write_time
+        ndr_uint32          :error_status
 
         def initialize_instance
           super
           @opnum = REG_ENUM_KEY
         end
-
-        # Determines the correct length for the padding in front of
-        # #lp_class. It should always force a 4-byte alignment.
-        def pad_length1
-          offset = (lp_name.abs_offset + lp_name.to_binary_s.length) % 4
-          (4 - offset) % 4
-        end
-
-        # Determines the correct length for the padding in front of
-        # #lpft_last_write_time. It should always force a 4-byte alignment.
-        def pad_length2
-          offset = (lp_class.abs_offset + lp_class.to_binary_s.length) % 4
-          (4 - offset) % 4
-        end
       end
-
     end
   end
 end