ruby_smb 2.0.12 → 3.0.2

data/spec/lib/ruby_smb/dcerpc/svcctl/control_service_request_spec.rb

@@ -16,8 +16,8 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::ControlServiceRequest do
   end
 
   describe '#dw_control' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_control).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_control).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/control_service_response_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::ControlServiceResponse do
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_request_spec.rb

@@ -1,8 +1,8 @@
 RSpec.describe RubySMB::Dcerpc::Svcctl::SvcctlHandleW do
   subject(:packet) { described_class.new }
 
-  it 'is NdrLpStr subclass' do
-    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrLpStr
+  it 'is Ndr::NdrWideStringzPtr subclass' do
+    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrWideStringzPtr
   end
 end
 
@@ -10,9 +10,7 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::OpenSCManagerWRequest do
   subject(:packet) { described_class.new }
 
   it { is_expected.to respond_to :lp_machine_name }
-  it { is_expected.to respond_to :pad1 }
   it { is_expected.to respond_to :lp_database_name }
-  it { is_expected.to respond_to :pad2 }
   it { is_expected.to respond_to :dw_desired_access }
 
   it 'is little endian' do
@@ -25,43 +23,35 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::OpenSCManagerWRequest do
     end
   end
 
-  describe '#pad1' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
-    end
-
-    it 'should keep #lp_database_name 4-byte aligned' do
-      packet.lp_machine_name = "test"
-      expect(packet.lp_database_name.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lp_database_name' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_database_name).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
+    it 'is a Ndr::NdrWideStringzPtr structure' do
+      expect(packet.lp_database_name).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringzPtr
     end
   end
 
-  describe '#pad2' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
+  describe '#dw_desired_access' do
+    it 'is a NdrUint32' do
+      expect(packet.dw_desired_access).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
+  end
 
-    it 'should keep #dw_desired_access 4-byte aligned' do
-      packet.lp_database_name = "test"
-      expect(packet.dw_desired_access.abs_offset % 4).to eq 0
+  describe '#initialize_instance' do
+    it 'sets #opnum to OPEN_SC_MANAGER_W constant' do
+      expect(packet.opnum).to eq(RubySMB::Dcerpc::Svcctl::OPEN_SC_MANAGER_W)
     end
   end
 
-  describe '#dw_desired_access' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_desired_access).to be_a BinData::Uint32le
+  it 'should keep #lp_database_name 4-byte aligned' do
+    5.times do |i|
+      packet.lp_machine_name = "A" * i
+      expect(packet.lp_database_name.abs_offset % 4).to eq 0
     end
   end
 
-  describe '#initialize_instance' do
-    it 'sets #opnum to OPEN_SC_MANAGER_W constant' do
-      expect(packet.opnum).to eq(RubySMB::Dcerpc::Svcctl::OPEN_SC_MANAGER_W)
+  it 'should keep #dw_desired_access 4-byte aligned' do
+    5.times do |i|
+      packet.lp_database_name = "A" * i
+      expect(packet.dw_desired_access.abs_offset % 4).to eq 0
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/open_sc_manager_w_response_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::OpenSCManagerWResponse do
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/open_service_w_request_spec.rb

@@ -3,7 +3,6 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::OpenServiceWRequest do
 
   it { is_expected.to respond_to :lp_sc_handle }
   it { is_expected.to respond_to :lp_service_name }
-  it { is_expected.to respond_to :pad }
   it { is_expected.to respond_to :dw_desired_access }
 
   it 'is little endian' do
@@ -18,28 +17,23 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::OpenServiceWRequest do
   end
 
   describe '#lp_service_name' do
-    it 'is a NdrString structure' do
-      expect(packet.lp_service_name).to be_a RubySMB::Dcerpc::Ndr::NdrString
+    it 'is a NdrConfVarWideStringz structure' do
+      expect(packet.lp_service_name).to be_a RubySMB::Dcerpc::Ndr::NdrConfVarWideStringz
     end
   end
 
-  describe '#pad' do
-    it 'is a string' do
-      expect(packet.pad).to be_a BinData::String
-    end
-
-    it 'should keep #dw_desired_access 4-byte aligned' do
-      packet.lp_service_name = "test"
-      expect(packet.dw_desired_access.abs_offset % 4).to eq 0
+  describe '#dw_desired_access' do
+    it 'is a NdrUint32' do
+      expect(packet.dw_desired_access).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
-  describe '#dw_desired_access' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_desired_access).to be_a BinData::Uint32le
+  it 'should keep #dw_desired_access 4-byte aligned' do
+    5.times do |i|
+      packet.lp_service_name = "A" * i
+      expect(packet.dw_desired_access.abs_offset % 4).to eq 0
     end
   end
-
   describe '#initialize_instance' do
     it 'sets #opnum to OPEN_SERVICE_W constant' do
       expect(packet.opnum).to eq(RubySMB::Dcerpc::Svcctl::OPEN_SERVICE_W)

data/spec/lib/ruby_smb/dcerpc/svcctl/open_service_w_response_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::OpenServiceWResponse do
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/query_service_config_w_request_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::QueryServiceConfigWRequest do
   end
 
   describe '#cb_buf_size' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.cb_buf_size).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.cb_buf_size).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/query_service_config_w_response_spec.rb

@@ -1,8 +1,8 @@
 RSpec.describe RubySMB::Dcerpc::Svcctl::LpBoundedDword8k do
   subject(:packet) { described_class.new }
 
-  it 'is BinData::Uint32le subclass' do
-    expect(described_class).to be < BinData::Uint32le
+  it 'is NdrUint32 subclass' do
+    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrUint32
   end
 end
 
@@ -24,56 +24,56 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::QueryServiceConfigW do
   end
 
   describe '#dw_service_type' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_service_type).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_service_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_start_type' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_start_type).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_start_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_error_control' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_error_control).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_error_control).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lp_binary_path_name' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_binary_path_name).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
+    it 'is a NdrWideStringPtr structure' do
+      expect(packet.lp_binary_path_name).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 
   describe '#lp_load_order_group' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_load_order_group).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
+    it 'is a NdrWideStringPtr structure' do
+      expect(packet.lp_load_order_group).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 
   describe '#dw_tag_id' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_tag_id).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_tag_id).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lp_dependencies' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_dependencies).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
+    it 'is a NdrWideStringPtr structure' do
+      expect(packet.lp_dependencies).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 
   describe '#lp_service_start_name' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_service_start_name).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
+    it 'is a NdrWideStringPtr structure' do
+      expect(packet.lp_service_start_name).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 
   describe '#lp_display_name' do
-    it 'is a NdrLpStr structure' do
-      expect(packet.lp_display_name).to be_a RubySMB::Dcerpc::Ndr::NdrLpStr
+    it 'is a NdrWideStringPtr structure' do
+      expect(packet.lp_display_name).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 
@@ -118,8 +118,8 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::QueryServiceConfigWResponse do
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/query_service_status_response_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::QueryServiceStatusResponse do
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/service_status_spec.rb

@@ -1,4 +1,8 @@
 RSpec.describe RubySMB::Dcerpc::Svcctl::ServiceStatus do
+  it 'is a NdrStruct' do
+    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrStruct
+  end
+
   subject(:packet) { described_class.new }
 
   it { is_expected.to respond_to :dw_service_type }
@@ -14,44 +18,44 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::ServiceStatus do
   end
 
   describe '#dw_service_type' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_service_type).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_service_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_current_state' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_current_state).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_current_state).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_controls_accepted' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_controls_accepted).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_controls_accepted).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_win32_exit_code' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_win32_exit_code).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_win32_exit_code).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_service_specific_exit_code' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_service_specific_exit_code).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_service_specific_exit_code).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_check_point' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_check_point).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_check_point).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#dw_wait_hint' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_wait_hint).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_wait_hint).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/start_service_w_request_spec.rb

@@ -16,14 +16,15 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::StartServiceWRequest do
   end
 
   describe '#argc' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.argc).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.argc).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#argv' do
-    it 'is a NdrLpStringPtrsw structure' do
-      expect(packet.argv).to be_a RubySMB::Dcerpc::Ndr::NdrLpStringPtrsw
+    it 'is a Ndr::NdrConfArray of Ndr::NdrWideStringPtr elements' do
+      expect(packet.argv).to be_a RubySMB::Dcerpc::Ndr::NdrConfArray
+      expect(packet.argv[0]).to be_a RubySMB::Dcerpc::Ndr::NdrWideStringPtr
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl/start_service_w_response_spec.rb

@@ -8,8 +8,8 @@ RSpec.describe RubySMB::Dcerpc::Svcctl::StartServiceWResponse do
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/svcctl_spec.rb

@@ -6,9 +6,6 @@ RSpec.describe RubySMB::Dcerpc::Svcctl do
       name: 'svcctl'
     )
   end
-  it 'fail' do
-    expect(true).to be true
-  end
 
   describe '#open_sc_manager_w' do
     let(:rhost) { '1.2.3.4' }
@@ -390,10 +387,9 @@ RSpec.describe RubySMB::Dcerpc::Svcctl do
 
     it 'sets the provided Service start arguments' do
       argv = ['my', 'arguments', 'to', 'test']
-      ndr_string_ptrsw = RubySMB::Dcerpc::Ndr::NdrStringPtrsw.new(elements: argv)
       svcctl.start_service_w(svc_handle, argv)
       expect(start_service_w_request).to have_received(:argc=).with(argv.size)
-      expect(start_service_w_request).to have_received(:argv=).with(ndr_string_ptrsw)
+      expect(start_service_w_request).to have_received(:argv=).with(argv)
     end
 
     it 'sends the expected dcerpc request' do

data/spec/lib/ruby_smb/dcerpc/uuid_spec.rb

@@ -12,6 +12,10 @@ RSpec.describe RubySMB::Dcerpc::Uuid do
     expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
   end
 
+  it 'is 4-byte aligned' do
+    expect(packet.eval_parameter(:byte_align)).to eq(4)
+  end
+
   describe '#time_low' do
     it 'should be a 32-bit unsigned integer' do
       expect(packet.time_low).to be_a BinData::Uint32le
@@ -78,31 +82,19 @@ RSpec.describe RubySMB::Dcerpc::Uuid do
         expect(packet.clock_seq_low).to eq 0xE8
         expect(packet.node).to eq [0x08, 0x00, 0x2B, 0x10, 0x48, 0x60]
       end
+
+      it 'removes surrounding curly brackets' do
+        packet.set("{#{uuid_string}}")
+        expect(packet).to eq(uuid_string)
+      end
     end
   end
 
-end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-RSpec.describe RubySMB::Dcerpc::Uuid do
-  let(:uuid_string){'8a885d04-1ceb-11c9-9fe8-08002b104860'}
-  let(:uuid){RubySMB::Dcerpc::Uuid.new(initial_value: uuid_string)}
-
-  describe '#initialize' do
-    it 'should create a 16 byte struct' do
-      expect(uuid.do_num_bytes).to be 16
-    end
+  it 'reads its own binary representation and output the same packet' do
+    packet = described_class.new('8a885d04-1ceb-11c9-9fe8-08002b104860')
+    binary = packet.to_binary_s
+    expect(described_class.read(binary)).to eq(packet)
   end
+
 end
+

data/spec/lib/ruby_smb/dcerpc/winreg/close_key_response_spec.rb

@@ -22,8 +22,8 @@ RSpec.describe RubySMB::Dcerpc::Winreg::CloseKeyResponse do
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/winreg/create_key_request_spec.rb

@@ -16,13 +16,10 @@ RSpec.describe RubySMB::Dcerpc::Winreg::CreateKeyRequest do
 
   it { is_expected.to respond_to :hkey }
   it { is_expected.to respond_to :lp_sub_key }
-  it { is_expected.to respond_to :pad1 }
   it { is_expected.to respond_to :lp_class }
-  it { is_expected.to respond_to :pad2 }
   it { is_expected.to respond_to :dw_options }
   it { is_expected.to respond_to :sam_desired }
   it { is_expected.to respond_to :lp_security_attributes }
-  it { is_expected.to respond_to :pad3 }
   it { is_expected.to respond_to :lpdw_disposition }
 
   describe '#hkey' do
@@ -37,37 +34,15 @@ RSpec.describe RubySMB::Dcerpc::Winreg::CreateKeyRequest do
     end
   end
 
-  describe '#pad1' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
-    end
-
-    it 'should keep #lp_class 4-byte aligned' do
-      packet.lp_sub_key = "test"
-      expect(packet.lp_class.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lp_class' do
     it 'is a RrpUnicodeString structure' do
       expect(packet.lp_class).to be_a RubySMB::Dcerpc::RrpUnicodeString
     end
   end
 
-  describe '#pad2' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
-    end
-
-    it 'should keep #dw_options 4-byte aligned' do
-      packet.lp_class = "test"
-      expect(packet.dw_options.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#dw_options' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_options).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_options).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
@@ -83,21 +58,9 @@ RSpec.describe RubySMB::Dcerpc::Winreg::CreateKeyRequest do
     end
   end
 
-  describe '#pad3' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
-    end
-
-    it 'should keep #lpdw_disposition 4-byte aligned' do
-      sc = RubySMB::Dcerpc::RpcSecurityDescriptor.new(lp_security_descriptor: [1,2,3,4])
-      packet.lp_security_attributes = RubySMB::Dcerpc::RpcSecurityAttributes.new(rpc_security_descriptor: sc)
-      expect(packet.lpdw_disposition.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lpdw_disposition' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpdw_disposition).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a NdrUint32Ptr structure' do
+      expect(packet.lpdw_disposition).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 

data/spec/lib/ruby_smb/dcerpc/winreg/create_key_response_spec.rb

@@ -24,14 +24,14 @@ RSpec.describe RubySMB::Dcerpc::Winreg::CreateKeyResponse do
   end
 
   describe '#lpdw_disposition' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpdw_disposition).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lpdw_disposition).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#error_status' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.error_status).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.error_status).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end