ruby_smb 3.0.6 → 3.1.0

data/lib/ruby_smb/smb2/packet/transform_header.rb

@@ -8,7 +8,7 @@ module RubySMB
         hide   :reserved0
 
         endian           :little
-        bit32            :protocol,              label: 'Protocol ID Field',      initial_value: 0xFD534D42
+        bit32            :protocol,              label: 'Protocol ID Field',      initial_value: RubySMB::SMB2::SMB2_TRANSFORM_PROTOCOL_ID
         string           :signature,             label: 'Signature', length: 16
         string           :nonce,                 label: 'Nonce',     length: 16
         uint32           :original_message_size, label: 'Original Message Size'
@@ -22,13 +22,13 @@ module RubySMB
           encrypted_data = self.encrypted_data.to_ary.pack('C*')
 
           case algorithm
-          when 'AES-128-CCM'
+          when 'AES-128-CCM', 'AES-256-CCM'
             cipher = OpenSSL::CCM.new('AES', key, 16)
             unencrypted_data = cipher.decrypt(encrypted_data + self.signature, self.nonce[0...11], auth_data)
             unless unencrypted_data.length > 0
               raise OpenSSL::Cipher::CipherError  # raised for consistency with GCM mode
             end
-          when 'AES-128-GCM'
+          when 'AES-128-GCM', 'AES-256-GCM'
             cipher = OpenSSL::Cipher.new(algorithm).decrypt
             cipher.key = key
             cipher.iv = self.nonce[0...12]
@@ -37,7 +37,7 @@ module RubySMB
             unencrypted_data = cipher.update(encrypted_data)
             cipher.final # raises OpenSSL::Cipher::CipherError on signature failure
           else
-            raise ArgumentError.new('Invalid algorithm, must be either AES-128-CCM or AES-128-GCM')
+            raise ArgumentError.new('Invalid algorithm, must be one of AES-128-CCM, AES-128-GCM, AES-256-CCM, or AES-256-GCM')
           end
 
           unencrypted_data[0...self.original_message_size]
@@ -53,14 +53,14 @@ module RubySMB
           self.original_message_size.assign(unencrypted_data.length)
 
           case algorithm
-          when 'AES-128-CCM'
+          when 'AES-128-CCM', 'AES-256-CCM'
             cipher = OpenSSL::CCM.new('AES', key, 16)
             random_iv = OpenSSL::Random.random_bytes(11)
             self.nonce.assign(random_iv)
             result = cipher.encrypt(unencrypted_data, random_iv, self.to_binary_s[20...52])
             encrypted_data = result[0...-16]
             auth_tag = result[-16..-1]
-          when 'AES-128-GCM'
+          when 'AES-128-GCM', 'AES-256-GCM'
             cipher = OpenSSL::Cipher.new(algorithm).encrypt
             cipher.iv_len = 12
             cipher.key = key
@@ -69,7 +69,7 @@ module RubySMB
             encrypted_data = cipher.update(unencrypted_data) + cipher.final
             auth_tag = cipher.auth_tag
           else
-            raise ArgumentError.new('Invalid algorithm, must be either AES-128-CCM or AES-128-GCM')
+            raise ArgumentError.new('Invalid algorithm, must be one of AES-128-CCM, AES-128-GCM, AES-256-CCM, or AES-256-GCM')
           end
 
           self.encrypted_data.assign(encrypted_data.bytes)

data/lib/ruby_smb/smb2.rb

@@ -5,6 +5,7 @@ module RubySMB
   module SMB2
     # Protocol ID value. Translates to \xFESMB
     SMB2_PROTOCOL_ID = 0xFE534D42
+    SMB2_TRANSFORM_PROTOCOL_ID = 0xFD534D42
     # Wildcard revision, see: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-smb2/63abf97c-0d09-47e2-88d6-6bfa552949a5
     SMB2_WILDCARD_REVISION = 0x02ff
 

data/lib/ruby_smb/version.rb

@@ -1,3 +1,3 @@
 module RubySMB
-  VERSION = '3.0.6'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/spec/lib/ruby_smb/client_spec.rb

@@ -962,8 +962,10 @@ RSpec.describe RubySMB::Client do
           expect(nc.length).to eq(1)
           expect(nc.first.data.ciphers).to eq(
             [
-              RubySMB::SMB2::EncryptionCapabilities::AES_128_CCM,
-              RubySMB::SMB2::EncryptionCapabilities::AES_128_GCM
+              RubySMB::SMB2::EncryptionCapabilities::AES_256_GCM,
+              RubySMB::SMB2::EncryptionCapabilities::AES_256_CCM,
+              RubySMB::SMB2::EncryptionCapabilities::AES_128_GCM,
+              RubySMB::SMB2::EncryptionCapabilities::AES_128_CCM
             ]
           )
         end
@@ -2681,13 +2683,15 @@ RSpec.describe RubySMB::Client do
         context "with #{dialect} dialect" do
           before :example do
             client.dialect = dialect
+            client.encryption_algorithm = 'AES-128-CCM'
           end
 
           it 'generates the client encryption key with the expected parameters' do
             expect(RubySMB::Crypto::KDF).to receive(:counter_mode).with(
               session_key,
               "SMB2AESCCM\x00",
-              "ServerIn \x00"
+              "ServerIn \x00",
+              {length: 128}
             ).and_call_original
             client.smb3_encrypt(data)
           end
@@ -2698,10 +2702,12 @@ RSpec.describe RubySMB::Client do
         it 'generates the client encryption key with the expected parameters' do
           client.preauth_integrity_hash_value = ''
           client.dialect = '0x0311'
+          client.encryption_algorithm = 'AES-128-CCM'
           expect(RubySMB::Crypto::KDF).to receive(:counter_mode).with(
             session_key,
             "SMBC2SCipherKey\x00",
-            ''
+            '',
+            {length: 128}
           ).and_call_original
           client.smb3_encrypt(data)
         end
@@ -2723,6 +2729,7 @@ RSpec.describe RubySMB::Client do
 
       it 'generates the expected client encryption key with 0x0302 dialect' do
         client.dialect = '0x0302'
+        client.encryption_algorithm = 'AES-128-CCM'
         expected_enc_key =
           "\xa4\xfa\x23\xc1\xb0\x65\x84\xce\x47\x08\x5b\xe0\x64\x98\xd7\x87".b
         client.smb3_encrypt(data)
@@ -2731,6 +2738,7 @@ RSpec.describe RubySMB::Client do
 
       it 'generates the expected client encryption key with 0x0311 dialect' do
         client.dialect = '0x0311'
+        client.encryption_algorithm = 'AES-128-CCM'
         client.session_key =
           "\x5c\x00\x4a\x3b\xf0\xa2\x4f\x75\x4c\xb2\x74\x0a\xcf\xc4\x8e\x1a".b
         client.preauth_integrity_hash_value =
@@ -2765,13 +2773,15 @@ RSpec.describe RubySMB::Client do
         context "with #{dialect} dialect" do
           before :example do
             client.dialect = dialect
+            client.encryption_algorithm = 'AES-128-CCM'
           end
 
           it 'generates the client encryption key with the expected parameters' do
             expect(RubySMB::Crypto::KDF).to receive(:counter_mode).with(
               session_key,
               "SMB2AESCCM\x00",
-              "ServerOut\x00"
+              "ServerOut\x00",
+              {length: 128}
             ).and_call_original
             client.smb3_decrypt(transform_packet)
           end
@@ -2782,10 +2792,12 @@ RSpec.describe RubySMB::Client do
         it 'generates the client encryption key with the expected parameters' do
           client.preauth_integrity_hash_value = ''
           client.dialect = '0x0311'
+          client.encryption_algorithm = 'AES-128-CCM'
           expect(RubySMB::Crypto::KDF).to receive(:counter_mode).with(
             session_key,
             "SMBS2CCipherKey\x00",
-            ''
+            '',
+            {length: 128}
           ).and_call_original
           client.smb3_decrypt(transform_packet)
         end
@@ -2806,6 +2818,7 @@ RSpec.describe RubySMB::Client do
 
       it 'generates the expected server encryption key with 0x0302 dialect' do
         client.dialect = '0x0302'
+        client.encryption_algorithm = 'AES-128-CCM'
         expected_enc_key =
           "\x65\x21\xd3\x6d\xe9\xe3\x5a\x66\x09\x61\xae\x3e\xc6\x49\x6b\xdf".b
         client.smb3_decrypt(transform_packet)
@@ -2814,6 +2827,7 @@ RSpec.describe RubySMB::Client do
 
       it 'generates the expected server encryption key with 0x0311 dialect' do
         client.dialect = '0x0311'
+        client.encryption_algorithm = 'AES-128-CCM'
         client.session_key =
           "\x5c\x00\x4a\x3b\xf0\xa2\x4f\x75\x4c\xb2\x74\x0a\xcf\xc4\x8e\x1a".b
         client.preauth_integrity_hash_value =

data/spec/lib/ruby_smb/smb1/packet/trans2/find_first2_request_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::FindFirst2Request do
       expect(parameter_block).to be_a RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
     end
 
-    it 'should have the setup set to the OPEN2 subcommand' do
+    it 'should have the setup set to the FIND_FIRST2 subcommand' do
       expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::FIND_FIRST2
     end
   end
@@ -47,7 +47,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::FindFirst2Request do
     end
 
     it 'should keep #trans2_data 4-byte aligned' do
-      expect(data_block.trans2_data.abs_offset % 4).to eq 0
+      expect(data_block.trans2_data.abs_offset % 4).to eq 0 if data_block.trans2_data.num_bytes != 0
     end
 
     describe '#trans2_parameters' do

data/spec/lib/ruby_smb/smb1/packet/trans2/find_first2_response_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::FindFirst2Response do
   describe '#parameter_block' do
     subject(:parameter_block) { packet.parameter_block }
 
-    it 'should have the setup set to the OPEN2 subcommand' do
+    it 'should have the setup set to the FIND_FIRST2 subcommand' do
       expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::FIND_FIRST2
     end
   end
@@ -40,7 +40,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::FindFirst2Response do
     end
 
     it 'should keep #trans2_data 4-byte aligned' do
-      expect(data_block.trans2_data.abs_offset % 4).to eq 0
+      expect(data_block.trans2_data.abs_offset % 4).to eq 0 if data_block.trans2_data.num_bytes != 0
     end
 
     describe '#trans2_parameters' do
@@ -57,6 +57,40 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::FindFirst2Response do
       subject(:data) { data_block.trans2_data }
 
       it { is_expected.to respond_to :buffer }
+
+      describe '#buffer' do
+        it 'is a String field' do
+          expect(data.buffer).to be_a BinData::String
+        end
+      end
+
+      context 'when the buffer is empty' do
+        before :each do
+          data.buffer = ''
+        end
+
+        it 'should not be padded' do
+          expect(data_block.pad2.num_bytes).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq ''
+        end
+      end
+
+      context 'when the buffer is not empty' do
+        before :each do
+          data.buffer = 'test'
+        end
+
+        it 'should be padded to a 4-byte boundary' do
+          expect(data_block.trans2_data.abs_offset % 4).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq 'test'
+        end
+      end
     end
   end
 

data/spec/lib/ruby_smb/smb1/packet/trans2/find_next2_request_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::FindNext2Request do
       expect(parameter_block).to be_a RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
     end
 
-    it 'should have the setup set to the OPEN2 subcommand' do
+    it 'should have the setup set to the FIND_NEXT2 subcommand' do
       expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::FIND_NEXT2
     end
   end
@@ -47,7 +47,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::FindNext2Request do
     end
 
     it 'should keep #trans2_data 4-byte aligned' do
-      expect(data_block.trans2_data.abs_offset % 4).to eq 0
+      expect(data_block.trans2_data.abs_offset % 4).to eq 0 if data_block.trans2_data.num_bytes != 0
     end
 
     describe '#trans2_parameters' do

data/spec/lib/ruby_smb/smb1/packet/trans2/find_next2_response_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::FindNext2Response do
   describe '#parameter_block' do
     subject(:parameter_block) { packet.parameter_block }
 
-    it 'should have the setup set to the OPEN2 subcommand' do
+    it 'should have the setup set to the FIND_NEXT2 subcommand' do
       expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::FIND_NEXT2
     end
   end
@@ -56,6 +56,40 @@ RSpec.describe RubySMB::SMB1::Packet::Trans2::FindNext2Response do
       subject(:data) { data_block.trans2_data }
 
       it { is_expected.to respond_to :buffer }
+
+      describe '#buffer' do
+        it 'is a String field' do
+          expect(data.buffer).to be_a BinData::String
+        end
+      end
+
+      context 'when the buffer is empty' do
+        before :each do
+          data.buffer = ''
+        end
+
+        it 'should not be padded' do
+          expect(data_block.pad2.num_bytes).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq ''
+        end
+      end
+
+      context 'when the buffer is not empty' do
+        before :each do
+          data.buffer = 'test'
+        end
+
+        it 'should be padded to a 4-byte boundary' do
+          expect(data_block.trans2_data.abs_offset % 4).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq 'test'
+        end
+      end
     end
   end
 

data/spec/lib/ruby_smb/smb1/packet/trans2/query_file_information_request_spec.rb

@@ -0,0 +1,74 @@
+include RubySMB::Fscc::FileInformation
+
+RSpec.describe RubySMB::SMB1::Packet::Trans2::QueryFileInformationRequest do
+  subject(:packet) { described_class.new }
+
+  describe '#smb_header' do
+    subject(:header) { packet.smb_header }
+
+    it 'is a standard SMB Header' do
+      expect(header).to be_a RubySMB::SMB1::SMBHeader
+    end
+
+    it 'should have the command set to SMB_COM_TRANSACTION2' do
+      expect(header.command).to eq RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+    end
+
+    it 'should not have the response flag set' do
+      expect(header.flags.reply).to eq 0
+    end
+  end
+
+  describe '#parameter_block' do
+    subject(:parameter_block) { packet.parameter_block }
+
+    it 'is a standard ParameterBlock' do
+      expect(parameter_block).to be_a RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
+    end
+
+    it 'should have the setup set to the QUERY_FILE_INFORMATION subcommand' do
+      expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::QUERY_FILE_INFORMATION
+    end
+  end
+
+  describe '#data_block' do
+    subject(:data_block) { packet.data_block }
+
+    it 'is a standard DataBlock' do
+      expect(data_block).to be_a RubySMB::SMB1::DataBlock
+    end
+
+    it { is_expected.to respond_to :name }
+    it { is_expected.to respond_to :trans2_parameters }
+    it { is_expected.to respond_to :trans2_data }
+
+    it 'should keep #trans2_parameters 4-byte aligned' do
+      expect(data_block.trans2_parameters.abs_offset % 4).to eq 0
+    end
+
+    it 'should keep #trans2_data 4-byte aligned' do
+      data_block.trans2_parameters.information_level = FILE_DISPOSITION_INFORMATION + SMB_INFO_PASSTHROUGH
+      expect(data_block.trans2_data.abs_offset % 4).to eq 0 if data_block.trans2_data.num_bytes != 0
+    end
+
+    describe '#trans2_parameters' do
+      subject(:parameters) { data_block.trans2_parameters }
+
+      it { is_expected.to respond_to :fid }
+      it { is_expected.to respond_to :information_level }
+
+      describe '#fid' do
+        it 'is a 16-bit field' do
+          expect(parameters.fid).to be_a BinData::Uint16le
+        end
+      end
+
+      describe '#information_level' do
+        it 'is a 16-bit field' do
+          expect(parameters.information_level).to be_a BinData::Uint16le
+        end
+      end
+    end
+  end
+end
+

data/spec/lib/ruby_smb/smb1/packet/trans2/query_file_information_response_spec.rb

@@ -0,0 +1,96 @@
+RSpec.describe RubySMB::SMB1::Packet::Trans2::QueryFileInformationResponse do
+  subject(:packet) { described_class.new }
+
+  describe '#smb_header' do
+    subject(:header) { packet.smb_header }
+
+    it 'is a standard SMB Header' do
+      expect(header).to be_a RubySMB::SMB1::SMBHeader
+    end
+
+    it 'should have the command set to SMB_COM_TRANSACTION2' do
+      expect(header.command).to eq RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+    end
+
+    it 'should have the response flag set' do
+      expect(header.flags.reply).to eq 1
+    end
+  end
+
+  describe '#parameter_block' do
+    subject(:parameter_block) { packet.parameter_block }
+
+    it 'should have the setup set to the QUERY_FILE_INFORMATION subcommand' do
+      expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::QUERY_FILE_INFORMATION
+    end
+  end
+
+  describe '#data_block' do
+    subject(:data_block) { packet.data_block }
+
+    it 'is a standard DataBlock' do
+      expect(data_block).to be_a RubySMB::SMB1::DataBlock
+    end
+
+    it { is_expected.to respond_to :name }
+    it { is_expected.to respond_to :trans2_parameters }
+    it { is_expected.to respond_to :trans2_data }
+
+    it 'should keep #trans2_parameters 4-byte aligned' do
+      expect(data_block.trans2_parameters.abs_offset % 4).to eq 0
+    end
+
+    describe '#trans2_parameters' do
+      subject(:parameters) { data_block.trans2_parameters }
+
+      it { is_expected.to respond_to :ea_error_offset }
+
+      describe '#ea_error_offset' do
+        it 'is a 16-bit field' do
+          expect(parameters.ea_error_offset).to be_a BinData::Uint16le
+        end
+      end
+    end
+
+    describe '#trans2_data' do
+      subject(:data) { data_block.trans2_data }
+
+      it { is_expected.to respond_to :buffer }
+
+      describe '#buffer' do
+        it 'is a String field' do
+          expect(data.buffer).to be_a BinData::String
+        end
+      end
+
+      context 'when the buffer is empty' do
+        before :each do
+          data.buffer = ''
+        end
+
+        it 'should not be padded' do
+          expect(data_block.pad2.num_bytes).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq ''
+        end
+      end
+
+      context 'when the buffer is not empty' do
+        before :each do
+          data.buffer = 'test'
+        end
+
+        it 'should be padded to a 4-byte boundary' do
+          expect(data_block.trans2_data.abs_offset % 4).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq 'test'
+        end
+      end
+    end
+  end
+
+end

data/spec/lib/ruby_smb/smb1/packet/trans2/query_fs_information_request_spec.rb

@@ -0,0 +1,62 @@
+include RubySMB::Fscc::FileInformation
+
+RSpec.describe RubySMB::SMB1::Packet::Trans2::QueryFsInformationRequest do
+  subject(:packet) { described_class.new }
+
+  describe '#smb_header' do
+    subject(:header) { packet.smb_header }
+
+    it 'is a standard SMB Header' do
+      expect(header).to be_a RubySMB::SMB1::SMBHeader
+    end
+
+    it 'should have the command set to SMB_COM_TRANSACTION2' do
+      expect(header.command).to eq RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+    end
+
+    it 'should not have the response flag set' do
+      expect(header.flags.reply).to eq 0
+    end
+  end
+
+  describe '#parameter_block' do
+    subject(:parameter_block) { packet.parameter_block }
+
+    it 'is a standard ParameterBlock' do
+      expect(parameter_block).to be_a RubySMB::SMB1::Packet::Trans2::Request::ParameterBlock
+    end
+
+    it 'should have the setup set to the QUERY_FS_INFORMATION subcommand' do
+      expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::QUERY_FS_INFORMATION
+    end
+  end
+
+  describe '#data_block' do
+    subject(:data_block) { packet.data_block }
+
+    it 'is a standard DataBlock' do
+      expect(data_block).to be_a RubySMB::SMB1::DataBlock
+    end
+
+    it { is_expected.to respond_to :name }
+    it { is_expected.to respond_to :trans2_parameters }
+    it { is_expected.to_not respond_to :trans2_data }
+
+    it 'should keep #trans2_parameters 4-byte aligned' do
+      expect(data_block.trans2_parameters.abs_offset % 4).to eq 0
+    end
+
+    describe '#trans2_parameters' do
+      subject(:parameters) { data_block.trans2_parameters }
+
+      it { is_expected.to respond_to :information_level }
+
+      describe '#information_level' do
+        it 'is a 16-bit field' do
+          expect(parameters.information_level).to be_a BinData::Uint16le
+        end
+      end
+    end
+  end
+end
+

data/spec/lib/ruby_smb/smb1/packet/trans2/query_fs_information_response_spec.rb

@@ -0,0 +1,88 @@
+RSpec.describe RubySMB::SMB1::Packet::Trans2::QueryFsInformationResponse do
+  subject(:packet) { described_class.new }
+
+  describe '#smb_header' do
+    subject(:header) { packet.smb_header }
+
+    it 'is a standard SMB Header' do
+      expect(header).to be_a RubySMB::SMB1::SMBHeader
+    end
+
+    it 'should have the command set to SMB_COM_TRANSACTION2' do
+      expect(header.command).to eq RubySMB::SMB1::Commands::SMB_COM_TRANSACTION2
+    end
+
+    it 'should have the response flag set' do
+      expect(header.flags.reply).to eq 1
+    end
+  end
+
+  describe '#parameter_block' do
+    subject(:parameter_block) { packet.parameter_block }
+
+    it 'should have the setup set to the QUERY_FS_INFORMATION subcommand' do
+      expect(parameter_block.setup).to include RubySMB::SMB1::Packet::Trans2::Subcommands::QUERY_FS_INFORMATION
+    end
+  end
+
+  describe '#data_block' do
+    subject(:data_block) { packet.data_block }
+
+    it 'is a standard DataBlock' do
+      expect(data_block).to be_a RubySMB::SMB1::DataBlock
+    end
+
+    it { is_expected.to respond_to :name }
+    it { is_expected.to respond_to :trans2_parameters }
+    it { is_expected.to respond_to :trans2_data }
+
+    it 'should keep #trans2_parameters 4-byte aligned' do
+      expect(data_block.trans2_parameters.abs_offset % 4).to eq 0
+    end
+
+    describe '#trans2_parameters' do
+      subject(:parameters) { data_block.trans2_parameters }
+    end
+
+    describe '#trans2_data' do
+      subject(:data) { data_block.trans2_data }
+
+      it { is_expected.to respond_to :buffer }
+
+      describe '#buffer' do
+        it 'is a String field' do
+          expect(data.buffer).to be_a BinData::String
+        end
+      end
+
+      context 'when the buffer is empty' do
+        before :each do
+          data.buffer = ''
+        end
+
+        it 'should not be padded' do
+          expect(data_block.pad2.num_bytes).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq ''
+        end
+      end
+
+      context 'when the buffer is not empty' do
+        before :each do
+          data.buffer = 'test'
+        end
+
+        it 'should be padded to a 4-byte boundary' do
+          expect(data_block.trans2_data.abs_offset % 4).to eq 0
+        end
+
+        it 'should read its own binary representation' do
+          expect(packet.class.read(packet.to_binary_s).data_block.trans2_data.buffer).to eq 'test'
+        end
+      end
+    end
+  end
+
+end