ruby_smb 2.0.12 → 3.0.2

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

@@ -10,9 +10,7 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumKeyRequest do
   it { is_expected.to respond_to :hkey }
   it { is_expected.to respond_to :dw_index }
   it { is_expected.to respond_to :lp_name }
-  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 :lpft_last_write_time }
   it { is_expected.to respond_to :opnum }
 
@@ -27,8 +25,8 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumKeyRequest do
   end
 
   describe '#dw_index' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_index).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_index).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
@@ -38,37 +36,15 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumKeyRequest 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_name = "test"
-      expect(packet.lp_class.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lp_class' do
     it 'is a PrrpUnicodeString structure' do
       expect(packet.lp_class).to be_a RubySMB::Dcerpc::PrrpUnicodeString
     end
   end
 
-  describe '#pad2' do
-    it 'is a string' do
-      expect(packet.pad2).to be_a BinData::String
-    end
-
-    it 'should keep #lpft_last_write_time 4-byte aligned' do
-      packet.lp_class = "test"
-      expect(packet.lpft_last_write_time.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lpft_last_write_time' do
-    it 'is a NdrLpFileTime structure' do
-      expect(packet.lpft_last_write_time).to be_a RubySMB::Dcerpc::Ndr::NdrLpFileTime
+    it 'is a NdrFileTimePtr structure' do
+      expect(packet.lpft_last_write_time).to be_a RubySMB::Dcerpc::Ndr::NdrFileTimePtr
     end
   end
 
@@ -77,28 +53,4 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumKeyRequest do
       expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_ENUM_KEY)
     end
   end
-
-  describe '#pad_length1' do
-    it 'returns 0 when #lp_class is already 4-byte aligned' do
-      packet.lp_name = 'align'
-      expect(packet.pad_length1).to eq 0
-    end
-
-    it 'returns 2 when #lp_class is only 2-byte aligned' do
-      packet.lp_name = 'align' + 'A'
-      expect(packet.pad_length1).to eq 2
-    end
-  end
-
-  describe '#pad_length2' do
-    it 'returns 0 when #lpft_last_write_time is already 4-byte aligned' do
-      packet.lp_class = 'align'
-      expect(packet.pad_length2).to eq 0
-    end
-
-    it 'returns 2 when #lpft_last_write_time is only 2-byte aligned' do
-      packet.lp_class = 'align' + 'A'
-      expect(packet.pad_length2).to eq 2
-    end
-  end
 end

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

@@ -2,9 +2,7 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumKeyResponse do
   subject(:packet) { described_class.new }
 
   it { is_expected.to respond_to :lp_name }
-  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 :lpft_last_write_time }
   it { is_expected.to respond_to :error_status }
   it { is_expected.to respond_to :opnum }
@@ -20,47 +18,21 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumKeyResponse 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_name = "test"
-      expect(packet.lp_class.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lp_class' do
     it 'is a PrrpUnicodeString structure' do
       expect(packet.lp_class).to be_a RubySMB::Dcerpc::PrrpUnicodeString
     end
-
-    it 'has a initial value of 0' do
-      expect(packet.lp_class).to eq(0)
-    end
-  end
-
-  describe '#pad2' do
-    it 'is a string' do
-      expect(packet.pad2).to be_a BinData::String
-    end
-
-    it 'should keep #lpft_last_write_time 4-byte aligned' do
-      packet.lp_class = "test"
-      expect(packet.lpft_last_write_time.abs_offset % 4).to eq 0
-    end
   end
 
   describe '#lpft_last_write_time' do
-    it 'is a NdrLpFileTime structure' do
-      expect(packet.lpft_last_write_time).to be_a RubySMB::Dcerpc::Ndr::NdrLpFileTime
+    it 'is a NdrFileTimePtr structure' do
+      expect(packet.lpft_last_write_time).to be_a RubySMB::Dcerpc::Ndr::NdrFileTimePtr
     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
 
@@ -69,29 +41,5 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumKeyResponse do
       expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_ENUM_KEY)
     end
   end
-
-  describe '#pad_length1' do
-    it 'returns 0 when #lp_class is already 4-byte aligned' do
-      packet.lp_name = 'align'
-      expect(packet.pad_length1).to eq 0
-    end
-
-    it 'returns 2 when #lp_class is only 2-byte aligned' do
-      packet.lp_name = 'align' + 'A'
-      expect(packet.pad_length1).to eq 2
-    end
-  end
-
-  describe '#pad_length2' do
-    it 'returns 0 when #lpft_last_write_time is already 4-byte aligned' do
-      packet.lp_class = 'align'
-      expect(packet.pad_length2).to eq 0
-    end
-
-    it 'returns 2 when #lpft_last_write_time is only 2-byte aligned' do
-      packet.lp_class = 'align' + 'A'
-      expect(packet.pad_length2).to eq 2
-    end
-  end
 end
 

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

@@ -10,7 +10,6 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumValueRequest do
   it { is_expected.to respond_to :hkey }
   it { is_expected.to respond_to :dw_index }
   it { is_expected.to respond_to :lp_value_name }
-  it { is_expected.to respond_to :pad }
   it { is_expected.to respond_to :lp_type }
   it { is_expected.to respond_to :lp_data }
   it { is_expected.to respond_to :lpcb_data }
@@ -28,8 +27,8 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumValueRequest do
   end
 
   describe '#dw_index' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.dw_index).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.dw_index).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
@@ -39,38 +38,27 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumValueRequest do
     end
   end
 
-  describe '#pad' do
-    it 'is a string' do
-      expect(packet.pad).to be_a BinData::String
-    end
-
-    it 'should keep #lp_type 4-byte aligned' do
-      packet.lp_value_name = "test"
-      expect(packet.lp_type.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lp_type' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a NdrUint32Ptr structure' do
+      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lp_data' do
-    it 'is a NdrLpByteArray structure' do
-      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpByteArray
+    it 'is a NdrByteArrayPtr structure' do
+      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrByteArrayPtr
     end
   end
 
   describe '#lpcb_data' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a NdrUint32Ptr structure' do
+      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lpcb_len' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_len).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a NdrUint32Ptr structure' do
+      expect(packet.lpcb_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
@@ -79,16 +67,4 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumValueRequest do
       expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_ENUM_VALUE)
     end
   end
-
-  describe '#pad_length' do
-    it 'returns 0 when #lp_class is already 4-byte aligned' do
-      packet.lp_value_name = 'align'
-      expect(packet.pad_length).to eq 0
-    end
-
-    it 'returns 2 when #lp_class is only 2-byte aligned' do
-      packet.lp_value_name = 'align' + 'A'
-      expect(packet.pad_length).to eq 2
-    end
-  end
 end

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

@@ -2,7 +2,6 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumValueResponse do
   subject(:packet) { described_class.new }
 
   it { is_expected.to respond_to :lp_value_name }
-  it { is_expected.to respond_to :pad }
   it { is_expected.to respond_to :lp_type }
   it { is_expected.to respond_to :lp_data }
   it { is_expected.to respond_to :lpcb_data }
@@ -20,44 +19,33 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumValueResponse do
     end
   end
 
-  describe '#pad' do
-    it 'is a string' do
-      expect(packet.pad).to be_a BinData::String
-    end
-
-    it 'should keep #lp_type 4-byte aligned' do
-      packet.lp_value_name = "test"
-      expect(packet.lp_type.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lp_type' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a NdrUint32Ptr structure' do
+      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lp_data' do
-    it 'is a NdrLpByteArray structure' do
-      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpByteArray
+    it 'is a NdrByteArrayPtr structure' do
+      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrByteArrayPtr
     end
   end
 
   describe '#lpcb_data' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a NdrUint32Ptr structure' do
+      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lpcb_len' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_len).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a NdrUint32Ptr structure' do
+      expect(packet.lpcb_len).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
 
@@ -66,17 +54,5 @@ RSpec.describe RubySMB::Dcerpc::Winreg::EnumValueResponse do
       expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_ENUM_VALUE)
     end
   end
-
-  describe '#pad_length' do
-    it 'returns 0 when #lp_class is already 4-byte aligned' do
-      packet.lp_value_name = 'align'
-      expect(packet.pad_length).to eq 0
-    end
-
-    it 'returns 2 when #lp_class is only 2-byte aligned' do
-      packet.lp_value_name = 'align' + 'A'
-      expect(packet.pad_length).to eq 2
-    end
-  end
 end
 

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

@@ -9,7 +9,6 @@ RSpec.describe RubySMB::Dcerpc::Winreg::OpenKeyRequest do
 
   it { is_expected.to respond_to :hkey }
   it { is_expected.to respond_to :lp_sub_key }
-  it { is_expected.to respond_to :pad }
   it { is_expected.to respond_to :dw_options }
   it { is_expected.to respond_to :sam_desired }
   it { is_expected.to respond_to :opnum }
@@ -30,20 +29,9 @@ RSpec.describe RubySMB::Dcerpc::Winreg::OpenKeyRequest do
     end
   end
 
-  describe '#pad' do
-    it 'is a string' do
-      expect(packet.pad).to be_a BinData::String
-    end
-
-    it 'should keep #dw_options 4-byte aligned' do
-      packet.lp_sub_key = "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
 
@@ -58,17 +46,5 @@ RSpec.describe RubySMB::Dcerpc::Winreg::OpenKeyRequest do
       expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_OPEN_KEY)
     end
   end
-
-  describe '#pad_length' do
-    it 'returns 0 when #dw_options is already 4-byte aligned' do
-      packet.lp_sub_key = 'align'
-      expect(packet.pad_length).to eq 0
-    end
-
-    it 'returns 2 when #dw_options is only 2-byte aligned' do
-      packet.lp_sub_key = 'align' + 'A'
-      expect(packet.pad_length).to eq 2
-    end
-  end
 end
 

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

@@ -22,8 +22,8 @@ RSpec.describe RubySMB::Dcerpc::Winreg::OpenKeyResponse 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/open_root_key_request_spec.rb

@@ -1,38 +1,30 @@
 RSpec.describe RubySMB::Dcerpc::Winreg::PRegistryServerName do
-  it 'is NdrPointer subclass' do
-    expect(described_class).to be < RubySMB::Dcerpc::Ndr::NdrPointer
+  it 'is BinData::Array subclass' do
+    expect(described_class).to be < BinData::Array
+  end
+
+  it 'is a RubySMB::Dcerpc::Ndr::PointerClassPlugin class' do
+    expect(described_class).to be_a(RubySMB::Dcerpc::Ndr::PointerClassPlugin)
   end
 
   subject(:packet) { described_class.new }
 
-  it { is_expected.to respond_to :referent }
+  it { is_expected.to respond_to :ref_id }
 
-  it 'is little endian' do
-    expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
+  it 'is an array of UTF-16LE strings' do
+    expect(packet[0]).to be_a RubySMB::Field::String16
   end
 
-  describe '#referent' do
-    it 'is a string in UTF-16LE' do
-      expect(packet.referent).to be_a RubySMB::Field::String16
-    end
-
-    it 'only exists if #referent_id is not 0' do
-      packet.referent_id = 0
-      expect(packet.referent?).to be false
-    end
-
-    it 'reads 4-bytes' do
-      str = 'spec_test'.encode('utf-16le')
-      packet.referent.read(str)
-      expect(packet.referent.to_binary_s.bytes).to eq(str.bytes[0,4])
-    end
+  it 'is :null if #ref_id is 0' do
+    packet.ref_id = 0
+    expect(packet).to eq(:null)
   end
 end
 
 RSpec.describe RubySMB::Dcerpc::Winreg::OpenRootKeyRequest do
   subject(:packet) { described_class.new }
 
-  it { is_expected.to respond_to :p_registry_server_name }
+  it { is_expected.to respond_to :server_name }
   it { is_expected.to respond_to :sam_desired }
   it { is_expected.to respond_to :opnum }
 
@@ -40,9 +32,9 @@ RSpec.describe RubySMB::Dcerpc::Winreg::OpenRootKeyRequest do
     expect(described_class.fields.instance_variable_get(:@hints)[:endian]).to eq :little
   end
 
-  describe '#p_registry_server_name' do
+  describe '#server_name' do
     it 'is a PRegistryServerName structure' do
-      expect(packet.p_registry_server_name).to be_a RubySMB::Dcerpc::Winreg::PRegistryServerName
+      expect(packet.server_name).to be_a RubySMB::Dcerpc::Winreg::PRegistryServerName
     end
   end
 
@@ -60,8 +52,8 @@ RSpec.describe RubySMB::Dcerpc::Winreg::OpenRootKeyRequest do
       end
     end
 
-    it 'sets #p_registry_server_name.referent to :null' do
-      expect(packet.p_registry_server_name).to eq(:null)
+    it 'sets #server_name.referent to :null' do
+      expect(packet.server_name).to eq(:null)
     end
 
     context 'when #opnum is not OPEN_HKPD, OPEN_HKPT or OPEN_HKPN' do

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

@@ -22,8 +22,8 @@ RSpec.describe RubySMB::Dcerpc::Winreg::OpenRootKeyResponse 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/query_info_key_response_spec.rb

@@ -2,7 +2,6 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryInfoKeyResponse do
   subject(:packet) { described_class.new }
 
   it { is_expected.to respond_to :lp_class }
-  it { is_expected.to respond_to :pad }
   it { is_expected.to respond_to :lpc_sub_keys }
   it { is_expected.to respond_to :lpc_max_sub_key_len }
   it { is_expected.to respond_to :lpc_max_class_len }
@@ -23,73 +22,62 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryInfoKeyResponse do
       expect(packet.lp_class).to be_a RubySMB::Dcerpc::RrpUnicodeString
     end
 
-    it 'has an initial value of 0' do
-      expect(packet.lp_class).to eq(0)
-    end
-  end
-
-  describe '#pad' do
-    it 'is a string' do
-      expect(packet.pad).to be_a BinData::String
-    end
-
-    it 'should keep #lpc_sub_keys 4-byte aligned' do
-      packet.lp_class = 'test'
-      expect(packet.lpc_sub_keys.abs_offset % 4).to eq 0
+    it 'has the expected initial value' do
+      expect(packet.lp_class).to eq({:buffer_length=>0, :maximum_length=>0, :buffer=>:null})
     end
   end
 
   describe '#lpc_sub_keys' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpc_sub_keys).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpc_sub_keys).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpc_max_sub_key_len' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpc_max_sub_key_len).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpc_max_sub_key_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpc_max_class_len' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpc_max_class_len).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpc_max_class_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpc_values' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpc_values).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpc_values).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpcb_max_value_name_len' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpcb_max_value_name_len).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpcb_max_value_name_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpcb_max_value_len' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpcb_max_value_len).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpcb_max_value_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpcb_security_descriptor' do
-    it 'is a 32-bit unsigned integer' do
-      expect(packet.lpcb_security_descriptor).to be_a BinData::Uint32le
+    it 'is a NdrUint32' do
+      expect(packet.lpcb_security_descriptor).to be_a RubySMB::Dcerpc::Ndr::NdrUint32
     end
   end
 
   describe '#lpft_last_write_time' do
-    it 'is a FileTime structure' do
-      expect(packet.lpft_last_write_time).to be_a RubySMB::Field::FileTime
+    it 'is a NdrFileTime structure' do
+      expect(packet.lpft_last_write_time).to be_a RubySMB::Dcerpc::Ndr::NdrFileTime
     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
 
@@ -98,16 +86,4 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryInfoKeyResponse do
       expect(packet.opnum).to eq(RubySMB::Dcerpc::Winreg::REG_QUERY_INFO_KEY)
     end
   end
-
-  describe '#pad_length' do
-    it 'returns 0 when #lpc_sub_keys is already 4-byte aligned' do
-      packet.lp_class = 'align'
-      expect(packet.pad_length).to eq 0
-    end
-
-    it 'returns 2 when #lpc_sub_keys is only 2-byte aligned' do
-      packet.lp_class = 'align' + 'A'
-      expect(packet.pad_length).to eq 2
-    end
-  end
 end

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

@@ -9,10 +9,8 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueRequest do
 
   it { is_expected.to respond_to :hkey }
   it { is_expected.to respond_to :lp_value_name }
-  it { is_expected.to respond_to :pad1 }
   it { is_expected.to respond_to :lp_type }
   it { is_expected.to respond_to :lp_data }
-  it { is_expected.to respond_to :pad2 }
   it { is_expected.to respond_to :lpcb_data }
   it { is_expected.to respond_to :lpcb_len }
   it { is_expected.to respond_to :opnum }
@@ -33,49 +31,27 @@ RSpec.describe RubySMB::Dcerpc::Winreg::QueryValueRequest do
     end
   end
 
-  describe '#pad1' do
-    it 'is a string' do
-      expect(packet.pad1).to be_a BinData::String
-    end
-
-    it 'should keep #lp_type 4-byte aligned' do
-      packet.lp_value_name = 'test'
-      expect(packet.lp_type.abs_offset % 4).to eq 0
-    end
-  end
-
   describe '#lp_type' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lp_type).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lp_data' do
-    it 'is a NdrLpByteArray structure' do
-      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpByteArray
+    it 'is a Ndr::NdrByteArrayPtr structure' do
+      expect(packet.lp_data).to be_a RubySMB::Dcerpc::Ndr::NdrByteArrayPtr
     end
   end
 
   describe '#lpcb_data' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
-    end
-  end
-
-  describe '#pad2' do
-    it 'is a string' do
-      expect(packet.pad2).to be_a BinData::String
-    end
-
-    it 'should keep #lpcb_data 4-byte aligned' do
-      packet.lp_data = [1, 2]
-      expect(packet.lpcb_data.abs_offset % 4).to eq 0
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lpcb_data).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end
 
   describe '#lpcb_len' do
-    it 'is a NdrLpDword structure' do
-      expect(packet.lpcb_len).to be_a RubySMB::Dcerpc::Ndr::NdrLpDword
+    it 'is a Ndr::NdrUint32Ptr structure' do
+      expect(packet.lpcb_len).to be_a RubySMB::Dcerpc::Ndr::NdrUint32Ptr
     end
   end