packetgen-plugin-smb 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c44249205f74086ef6aa53ed5bae0b9cc4d988cbc32ed6280c389e222dfaa6
-  data.tar.gz: fa0c225d0bac37bf479969a2bd2a968309aacb1eb06d986d5784c99bde35575e
+  metadata.gz: f2f94bc3d0ed58308ab1d611d9faa159f435a63a814212a3ee14fa6272674d32
+  data.tar.gz: 6148519a4129845f7666ec176a794a5165877ef9a1baa087949c168ff0b0336e
 SHA512:
-  metadata.gz: 6f6834ace18bbb690025a2856be929abfa8355e218eaa66e67c76cbd0ce3711a55836d99a77d5a598d36a433b6c6ae0355103a91a726520f7204aa7494e40359
-  data.tar.gz: 6e87dddb4fcf4e5e4c6e534402321bc11d8e1c53b4f1fcba535ccf443ea42f6a17c1ed9935108cd066cc7fb522064f9ba43aff3b3e0aa49589ef58b0e67987b8
+  metadata.gz: 1cefd0a896096abb5c01234e3836b4b9aae5a1c408debdaafc997d57dbaa6cd778df977704ee5e64d9fb16f25720df15f5163d1470bbe85c8637364191e50cb6
+  data.tar.gz: 477d0dcee0533af2591c3ba0c8dcfe43b872cbd12a44a06a9195ad11850bc88c78d2a5c595577eee3f77c7109072240a38515a9955c8294ae4756d6cd8e823f7

data/.github/workflows/specs.yml

@@ -1,28 +1,32 @@
 name: Specs
+
 on:
   push:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        ruby: ['3.0', '3.1', '3.2', '3.3', '3.4']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install dependencies
       run: sudo apt-get update -qq && sudo apt-get install libpcap-dev -qq
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Run tests
+    - name: Install Gems
       run: |
         bundle config set path 'vendor/bundle'
         bundle config set --local without noci
         bundle install
+    - name: Run tests
+      run: |
         bundle exec rake

data/.rubocop.yml

@@ -1,7 +1,7 @@
-require:
+plugins:
   - rubocop-performance
 AllCops:
-  TargetRubyVersion: '2.5'
+  TargetRubyVersion: "3.0"
   NewCops: enable
   Exclude:
     - .git/**/*
@@ -16,11 +16,11 @@ Lint/EmptyWhen:
 Lint/Void:
   Enabled: false
 Metrics/AbcSize:
-    Max: 20
+  Max: 20
 Metrics/ClassLength:
-    Max: 200
+  Max: 200
 Metrics/MethodLength:
-    Max: 20
+  Max: 20
 Metrics/ParameterLists:
   MaxOptionalParameters: 4
 Naming/FileName:

data/Gemfile

@@ -5,14 +5,14 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'bundler', '>=1.17', '<3'
-gem 'rake', '~> 12.3'
-gem 'rspec', '~> 3.10'
+gem 'rake', '~>13.0', require: false
+gem 'rspec', '~>3.13'
 
 group :noci do
-  gem 'debase', '~>0.2'
-  gem 'rubocop', '~> 1.6.0'
-  gem 'rubocop-performance', '~> 1.9'
-  gem 'ruby-debug-ide', '~> 0.7'
+  gem 'rubocop', '~> 1.75', require: false
+  gem 'rubocop-performance', '~> 1.25', require: false
+  gem 'ruby-lsp', require: false
+  gem 'ruby-lsp-rspec', require: false
   gem 'simplecov', '~> 0.18'
-  gem 'yard', '~> 0.9'
+  gem 'yard', '~> 0.9', require: false
 end

data/README.md

@@ -32,11 +32,15 @@ gem 'packetgen-plugin-smb'
 
 And then execute:
 
-    $ bundle
+```bash
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install packetgen-plugin-smb
+```bash
+gem install packetgen-plugin-smb
+```
 
 ## Usage
 
@@ -79,7 +83,7 @@ You have to manage multicast if you want to make a LLMNR responder. For further
 
 ## See also
 
-API documentation: http://www.rubydoc.info/gems/packetgen-plugin-smb
+API documentation: <http://www.rubydoc.info/gems/packetgen-plugin-smb>
 
 ## License
 
@@ -87,4 +91,4 @@ MIT License (see [LICENSE](https://github.com/sdaubert/packetgen-plugin-smb/blob
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/sdaubert/packetgen-plugin-smb.
+Bug reports and pull requests are welcome on GitHub at <https://github.com/sdaubert/packetgen-plugin-smb>.

data/examples/llmnr-responder

@@ -70,7 +70,7 @@ class LlmnrResponder
       end
       response_pkt.calc
 
-      next unless response_pkt.llmnr.ancount > 0
+      next unless response_pkt.llmnr.ancount.positive?
 
       socket.send(response_pkt.to_s, 0, peer_ip, peer_port)
     end
@@ -105,6 +105,6 @@ end
 
 options = parse_options
 
-check_options options
+check_options(options)
 
 LlmnrResponder.new.start(bind_addr: BIND_ADDR, iface: options[:iface])

data/examples/smb-responder

@@ -28,7 +28,7 @@ Credentials = Struct.new(:user, :computer, :challenge, :proof, :response, :ip) d
   def to_s
     user = self.user.encode('UTF-8')
     computer = self.computer.encode('UTF-8')
-    str = +"User: #{user}\nComputer:#{computer} (IP: #{ip})\n"
+    str = "User: #{user}\nComputer:#{computer} (IP: #{ip})\n"
     str << "Challenge: #{challenge}\nProof: #{proof}\n"
     str << "Response: #{response}"
   end
@@ -77,7 +77,7 @@ class Smb2Responder
                                max_trans_size: SMB2_SIZE,
                                max_read_size: SMB2_SIZE,
                                max_write_size: SMB2_SIZE)
-    @resp1_pkt.smb2_negotiate_response[:buffer] = PacketGen::Types::String.new.read(SMB2_NEGO_RESP_BUFFER)
+    @resp1_pkt.smb2_negotiate_response[:buffer] = BinStruct::String.new.read(SMB2_NEGO_RESP_BUFFER)
     @resp1_pkt.calc
     @resp1_pkt
   end
@@ -105,13 +105,13 @@ class Smb2Responder
                         max_read_size: SMB2_SIZE,
                         max_write_size: SMB2_SIZE,
                         system_time: PacketGen::Plugin::SMB::Filetime.now,
-                        buffer: PacketGen::Types::String.new.read(SMB2_NEGO_RESP_BUFFER))
+                        buffer: BinStruct::String.new.read(SMB2_NEGO_RESP_BUFFER))
 
     pkt.smb2_negotiate_response.context_list << { type: 1, salt_length: SMB2_SALT_LEN, salt: salt }
-    pkt.smb2_negotiate_response.context_list.last.hash_alg << PacketGen::Types::Int16le.new(1)
+    pkt.smb2_negotiate_response.context_list.last.hash_alg << BinStruct::Int16le.new(value: 1)
 
     pkt.smb2_negotiate_response.context_list << { type: 2 }
-    pkt.smb2_negotiate_response.context_list.last.ciphers << PacketGen::Types::Int16le.new(1)
+    pkt.smb2_negotiate_response.context_list.last.ciphers << BinStruct::Int16le.new(value: 1)
     pkt.calc
     pkt
   end
@@ -165,7 +165,7 @@ class Smb2Responder
                         reserved: smb2_req.reserved)
                    .add('SMB2::SessionSetup::Response')
     # Remove buffer
-    pkt.smb2_sessionsetup_response[:buffer] = PacketGen::Types::String.new
+    pkt.smb2_sessionsetup_response[:buffer] = BinStruct::String.new
     pkt.calc
     pkt
   end
@@ -220,13 +220,13 @@ class Smb2Responder
         client.send(pkt_to_send.to_s, 0) if pkt_to_send
         client.close if to_close
 
-        puts credentials.to_s unless credentials.response.nil?
+        puts credentials unless credentials.response.nil?
       end
     end
   end
 
   def binary2hex(str)
-    str.unpack('H*').first
+    str.unpack1('H*')
   end
 end
 

data/lib/packetgen/plugin/gssapi.rb

@@ -61,7 +61,7 @@ module PacketGen::Plugin
   #   gssapi[:token_resp][:response]             #=> RASN1::Types::OctetString
   # @author Sylvain Daubert
   class GSSAPI < RASN1::Model
-    include PacketGen::Types::Fieldable
+    include BinStruct::Structable
 
     # GSS API Negotiation Token Init
     #
@@ -73,7 +73,8 @@ module PacketGen::Plugin
     # * +mech_token+ is an optional OCTET STRING, explicitly tagged 2.
     # * +mech_list_mic+ is an optional OCTET STRING, explicitly tagged 3.
     class NegTokenInit < RASN1::Model
-      sequence :token, explicit: 0, class: :context, constructed: true,
+      sequence :token,
+               explicit: 0, class: :context, constructed: true,
                content: [sequence_of(:mech_types, RASN1::Types::ObjectId, explicit: 0, class: :context),
                          bit_string(:req_flags, explicit: 1, class: :context, constructed: true, optional: true),
                          octet_string(:mech_token, explicit: 2, class: :context, constructed: true, optional: true),
@@ -89,7 +90,8 @@ module PacketGen::Plugin
         'reject' => 2,
         'request-mic' => 3
       }.freeze
-      sequence :token, explicit: 1, class: :context, constructed: true,
+      sequence :token,
+               explicit: 1, class: :context, constructed: true,
                content: [enumerated(:negstate, enum: NEG_STATES, explicit: 0, class: :context, constructed: true, optional: true),
                          objectid(:supported_mech, explicit: 1, class: :context, constructed: true, optional: true),
                          octet_string(:response, explicit: 2, class: :context, constructed: true, optional: true),
@@ -98,8 +100,8 @@ module PacketGen::Plugin
 
     class NegTokenInitEnvelop < RASN1::Model
       sequence(:init, implicit: 0, class: :application,
-               content: [objectid(:oid, value: '1.3.6.1.5.5.2'),
-                         model(:token_init, NegTokenInit)])
+                      content: [objectid(:oid, value: '1.3.6.1.5.5.2'),
+                                model(:token_init, NegTokenInit)])
     end
 
     choice :gssapi,

data/lib/packetgen/plugin/netbios/datagram.rb

@@ -35,63 +35,61 @@ module PacketGen::Plugin
       # @!attribute type
       #  8-bit session packet type
       #  @return [Integer]
-      define_field :type, PacketGen::Types::Int8Enum, enum: TYPES
+      define_attr :type, BinStruct::Int8Enum, enum: TYPES
       # @!attribute flags
       #  8-bit flags
       #  @return [Integer]
-      define_field :flags, PacketGen::Types::Int8
+      # @!attribute :rsv
+      #  4-bit rsv field. 4 upper bits of {#flags}
+      #  @return [Integer]
+      # @!attribute :snt
+      #  2-bit SNT (Source end-Node Type) field from {#flags}.
+      #  @return [Integer]
+      # @!attribute f
+      #  First packet flag. If set then this is first
+      #  (and possibly only) fragment of NetBIOS datagram.
+      #  @return [Boolean]
+      # @!attribute m
+      #  More flag. If set then more NetBIOS datagram
+      #  fragments follow.
+      #  @return [Boolean]
+      define_bit_attr :flags, rsv: 4, snt: 2, f: 1, m: 1
       # @!attribute dgm_id
       #  16-bit next transaction ID for datagrams
       #  @return [Integer]
-      define_field :dgm_id, PacketGen::Types::Int16
+      define_attr :dgm_id, BinStruct::Int16
       # @!attribute src_ip
       #  Source IP address
       # @return [IP::Addr]
-      define_field :src_ip, PacketGen::Header::IP::Addr
+      define_attr :src_ip, PacketGen::Header::IP::Addr
       # @!attribute src_port
       #  Source port
       # @return [IP::Addr]
-      define_field :src_port, PacketGen::Types::Int16
+      define_attr :src_port, BinStruct::Int16
       # @!attribute dgm_length
       #  Length of data + second level of encoded names. Not present in error datagram.
       # @return [Integer]
-      define_field :dgm_length, PacketGen::Types::Int16, optional: ->(h) { h.type != 0x13 }
+      define_attr :dgm_length, BinStruct::Int16, optional: ->(h) { h.type != 0x13 }
       # @!attribute packet_offset
       # Not present in error datagram.
       # @return [Integer]
-      define_field :packet_offset, PacketGen::Types::Int16, optional: ->(h) { h.type != 0x13 }
+      define_attr :packet_offset, BinStruct::Int16, optional: ->(h) { h.type != 0x13 }
       # @!attribute error_code
       #  Error code. Only present in error datagrams.
       #  @return [Integer]
-      define_field :error_code, PacketGen::Types::Int16, optional: ->(h) { h.type == 0x13 }
+      define_attr :error_code, BinStruct::Int16, optional: ->(h) { h.type == 0x13 }
       # @!attribute src_name
       #  NetBIOS source name. Only present in direct_unique, direct_group and broadcast datagrams.
       #  @return []
-      define_field :src_name, Name, default: '', optional: ->(h) { (h.type >= 0x10) && (h.type <= 0x12) }
+      define_attr :src_name, Name, default: '', optional: ->(h) { (h.type >= 0x10) && (h.type <= 0x12) }
       # @!attribute dst_name
       #  NetBIOS destination name. Present in all but error datagrams.
       #  @return []
-      define_field :dst_name, Name, default: '', optional: ->(h) { h.type != 0x13 }
+      define_attr :dst_name, Name, default: '', optional: ->(h) { h.type != 0x13 }
       # @!attribute body
       #  User data. Ony present in direct_unique, direct_group and broadcast datagrams.
       #  @return [String]
-      define_field :body, PacketGen::Types::String, optional: ->(h) { (h.type >= 0x10) && (h.type <= 0x12) }
-
-      # @!attribute :rsv
-      #  4-bit rsv field. 4 upper bits of {#flags}
-      #  @return [Integer]
-      # @!attribute :snt
-      #  2-bit SNT (Source end-Node Type) field from {#flags}.
-      #  @return [Integer]
-      # @!attribute f
-      #  First packet flag. If set then this is first
-      #  (and possibly only) fragment of NetBIOS datagram.
-      #  @return [Boolean]
-      # @!attribute m
-      #  More flag. If set then more NetBIOS datagram
-      #  fragments follow.
-      #  @return [Boolean]
-      define_bit_fields_on :flags, :rsv, 4, :snt, 2, :f, :m
+      define_attr :body, BinStruct::String, optional: ->(h) { (h.type >= 0x10) && (h.type <= 0x12) }
 
       # Compute and set {#dgm_length} field
       # @return [Integer] calculated length

data/lib/packetgen/plugin/netbios/name.rb

@@ -37,7 +37,7 @@ module PacketGen::Plugin
 
       def encode_name(name)
         basename, *scope_id = name.split('.')
-        basename = '' if basename.nil?
+        basename ||= ''
         scope_id = scope_id.join('.')
         encoded_name = +''
         basename.each_byte do |byte|
@@ -45,7 +45,7 @@ module PacketGen::Plugin
           b = (byte & 0xf) + 0x41
           encoded_name << [a, b].pack('C2')
         end
-        encoded_name << 'CA' * ((ENCODED_NAME_SIZE - encoded_name.size) / 2) if encoded_name.size < ENCODED_NAME_SIZE
+        encoded_name << ('CA' * ((ENCODED_NAME_SIZE - encoded_name.size) / 2)) if encoded_name.size < ENCODED_NAME_SIZE
         encoded_name << ".#{scope_id}" if scope_id
         encoded_name
       end
@@ -55,7 +55,7 @@ module PacketGen::Plugin
         encoded_name.partition('.').first.scan(/../).map do |duo|
           a = (duo[0].ord - 0x41) & 0xf
           b = (duo[1].ord - 0x41) & 0xf
-          name << (a << 4 | b).chr
+          name << ((a << 4) | b).chr
         end
         name.strip
       end

data/lib/packetgen/plugin/netbios/session.rb

@@ -36,14 +36,14 @@ module PacketGen::Plugin
       # @!attribute type
       #  8-bit session packet type
       #  @return [Integer]
-      define_field :type, PacketGen::Types::Int8Enum, enum: TYPES
+      define_attr :type, BinStruct::Int8Enum, enum: TYPES
       # @!attribute length
       #  17-bit session packet length
       #  @return [Integer]
-      define_field :length, PacketGen::Types::Int24
+      define_attr :length, BinStruct::Int24
       # @!attribute body
       #  @return [String]
-      define_field :body, PacketGen::Types::String
+      define_attr :body, BinStruct::String
 
       # Compute and set {#length} field
       # @return [Integer] calculated length

data/lib/packetgen/plugin/netbios.rb

@@ -5,8 +5,6 @@
 # Copyright (C) 2016 Sylvain Daubert <sylvain.daubert@laposte.net>
 # This program is published under MIT license.
 
-# frozen_string_literal: true
-
 module PacketGen::Plugin
   # Module to group all NetBIOS headers
   # @author Sylvain Daubert

data/lib/packetgen/plugin/ntlm/authenticate.rb

@@ -13,12 +13,12 @@ module PacketGen::Plugin
       # void MIC
       VOID_MIC = ([0] * 16).pack('C').freeze
 
-      update_field :type, default: NTLM::TYPES['authenticate']
+      update_attr :type, default: NTLM::TYPES['authenticate']
 
       # @!attribute lm_response
       #   A LM_RESPONSE or LMV2_RESPONSE structure that contains the computed
       #   LM response to the challenge.
-      #   @return [PacketGen::Types::String]
+      #   @return [BinStruct::String]
       # @!attribute lm_response_len
       #   16-bit unsigned integer that defines the size in bytes of
       #   {#lm_response} in {#payload}.
@@ -30,7 +30,7 @@ module PacketGen::Plugin
       #   A 32-bit unsigned integer that defines the offset, in bytes, from
       #   the beginning of the AUTHENTICATE MESSAGE to {#lm_response} in {#payload}.
       #   @return [Integer]
-      define_in_payload :lm_response, PacketGen::Types::String
+      define_in_payload :lm_response, BinStruct::String
 
       # @!attribute nt_response
       #   A NTLM_RESPONSE or NTLMV2_RESPONSE structure that contains the computed
@@ -96,7 +96,7 @@ module PacketGen::Plugin
 
       # @!attribute session_key
       #  The client's encrypted random session key. On
-      #  @return [PacketGen::Types::String]
+      #  @return [BinStruct::String]
       # @!attribute session_key_len
       #  2-byte {#session_key} length
       #  @return [Integer]
@@ -107,7 +107,7 @@ module PacketGen::Plugin
       #  4-byte {#session_key} offset from  the beginning of the AUTHENTICATE
       #  MESSAGE in {#payload}.
       #  @return [Integer]
-      define_in_payload :session_key, PacketGen::Types::String
+      define_in_payload :session_key, BinStruct::String
 
       # @!attribute flags
       #   Negotiate flags
@@ -186,12 +186,12 @@ module PacketGen::Plugin
       # @!attribute version
       #  8-byte version information
       #  @return [String]
-      define_field_before :payload, :version, PacketGen::Types::String, static_length: 8, default: VOID_VERSION
+      define_attr_before :payload, :version, BinStruct::String, static_length: 8, default: VOID_VERSION
 
       # @!attribute mic
       #  16-byte message integrity code
       #  @return [String]
-      define_field_before :payload, :mic, PacketGen::Types::String, static_length: 16, default: VOID_MIC
+      define_attr_before :payload, :mic, BinStruct::String, static_length: 16, default: VOID_MIC
     end
   end
 end

data/lib/packetgen/plugin/ntlm/av_pair.rb

@@ -23,9 +23,9 @@ module PacketGen::Plugin
     }.freeze
 
     # AVPAIR structure, with value of type {SMB::String}.
-    AvPair = PacketGen::Types::AbstractTLV.create(type_class: PacketGen::Types::Int16leEnum,
-                                                  length_class: PacketGen::Types::Int16le,
-                                                  value_class: SMB::String)
+    AvPair = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16leEnum,
+                                           length_class: BinStruct::Int16le,
+                                           value_class: SMB::String)
     AvPair.define_type_enum AVPAIR_TYPES
 
     class AvPair
@@ -36,30 +36,30 @@ module PacketGen::Plugin
     end
 
     # EOL AVPAIR structure, with no value
-    EOLAvPair = PacketGen::Types::AbstractTLV.create(type_class: PacketGen::Types::Int16leEnum,
-                                                     length_class: PacketGen::Types::Int16le)
+    EOLAvPair = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16leEnum,
+                                              length_class: BinStruct::Int16le)
     EOLAvPair.define_type_enum AVPAIR_TYPES
 
     # Timestamp AVPAIR structure, with value of type {SMB::Filetime}.
-    TimestampAvPair = PacketGen::Types::AbstractTLV.create(type_class: PacketGen::Types::Int16leEnum,
-                                                           length_class: PacketGen::Types::Int16le,
-                                                           value_class: SMB::Filetime)
+    TimestampAvPair = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16leEnum,
+                                                    length_class: BinStruct::Int16le,
+                                                    value_class: SMB::Filetime)
     TimestampAvPair.define_type_enum AVPAIR_TYPES
 
-    # Int32le AVPAIR structure, with value a {PacketGen::Types::Int32le}.
-    Int32leAvPair = PacketGen::Types::AbstractTLV.create(type_class: PacketGen::Types::Int16leEnum,
-                                                         length_class: PacketGen::Types::Int16le,
-                                                         value_class: PacketGen::Types::Int32le)
+    # Int32le AVPAIR structure, with value a {BinStruct::Int32le}.
+    Int32leAvPair = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16leEnum,
+                                                  length_class: BinStruct::Int16le,
+                                                  value_class: BinStruct::Int32le)
     Int32leAvPair.define_type_enum AVPAIR_TYPES
 
-    # String AVPAIR structure, with value a {PacketGen::Types::String}.
-    StringAvPair = PacketGen::Types::AbstractTLV.create(type_class: PacketGen::Types::Int16leEnum,
-                                                        length_class: PacketGen::Types::Int16le,
-                                                        value_class: PacketGen::Types::String)
+    # String AVPAIR structure, with value a {BinStruct::String}.
+    StringAvPair = BinStruct::AbstractTLV.create(type_class: BinStruct::Int16leEnum,
+                                                 length_class: BinStruct::Int16le,
+                                                 value_class: BinStruct::String)
     StringAvPair.define_type_enum AVPAIR_TYPES
 
     # Specialized array containing {AvPair AvPairs}.
-    class ArrayOfAvPair < PacketGen::Types::Array
+    class ArrayOfAvPair < BinStruct::Array
       set_of AvPair
 
       # Get unicode property

data/lib/packetgen/plugin/ntlm/challenge.rb

@@ -10,7 +10,7 @@ module PacketGen::Plugin
     # NTLM Challenge message
     # @author Sylvain Daubert
     class Challenge < NTLM
-      update_field :type, default: NTLM::TYPES['challenge']
+      update_attr :type, default: NTLM::TYPES['challenge']
 
       # @!attribute target_name
       #   Name of the server authentication realm. Must be expressed in the
@@ -108,11 +108,11 @@ module PacketGen::Plugin
       # @!attribute challenge
       #   64-bit value containing the NTLM challenge.
       #   @return [String]
-      define_field_before :payload, :challenge, PacketGen::Types::String, static_length: 8, default: VOID_CHALLENGE
+      define_attr_before :payload, :challenge, BinStruct::String, static_length: 8, default: VOID_CHALLENGE
       # @!attribute reserved
       #   64-bit reserved field
       #   @return [Integer]
-      define_field_before :payload, :reserved, PacketGen::Types::Int64le
+      define_attr_before :payload, :reserved, BinStruct::Int64le
 
       # @!attribute target_info
       #   @return [ArrayOfAvPair]
@@ -134,7 +134,7 @@ module PacketGen::Plugin
       # @!attribute version
       #  8-byte version information
       #  @return [String]
-      define_field_before :payload, :version, PacketGen::Types::String, static_length: 8, default: VOID_VERSION
+      define_attr_before :payload, :version, BinStruct::String, static_length: 8, default: VOID_VERSION
     end
   end
 end

data/lib/packetgen/plugin/ntlm/negotiate.rb

@@ -15,7 +15,7 @@ module PacketGen::Plugin
       # @return [String]
       attr_accessor :workstation
 
-      update_field :type, default: NTLM::TYPES['negotiate']
+      update_attr :type, default: NTLM::TYPES['negotiate']
       # @!attribute flags
       #   Negotiate flags
       #   @return [Integer]
@@ -92,7 +92,7 @@ module PacketGen::Plugin
 
       # @!attribute domain_name
       #  Name of the client authentication domain. Must be OEM encoded.
-      #  @return [PacketGen::Types::String]
+      #  @return [BinStruct::String]
       # @!attribute domain_name_len
       #  2-byte domain name length
       #  @return [Integer]
@@ -102,11 +102,11 @@ module PacketGen::Plugin
       # @!attribute domain_name_offset
       #  4-byte domain name offset
       #  @return [Integer]
-      define_in_payload :domain_name, PacketGen::Types::String
+      define_in_payload :domain_name, BinStruct::String
 
       # @!attribute workstation
       #  Name of the client machine. Must be OEM encoded.
-      #  @return [PacketGen::Types::String]
+      #  @return [BinStruct::String]
       # @!attribute workstation_len
       #  2-byte workstation length
       #  @return [Integer]
@@ -116,12 +116,12 @@ module PacketGen::Plugin
       # @!attribute workstation_offset
       #  4-byte workstation offset
       #  @return [Integer]
-      define_in_payload :workstation, PacketGen::Types::String
+      define_in_payload :workstation, BinStruct::String
 
       # @!attribute version
       #  8-byte version information
       #  @return [String]
-      define_field_before :payload, :version, PacketGen::Types::String, static_length: 8, default: VOID_VERSION
+      define_attr_before :payload, :version, BinStruct::String, static_length: 8, default: VOID_VERSION
     end
   end
 end

data/lib/packetgen/plugin/ntlm/ntlmv2_response.rb

@@ -7,46 +7,46 @@
 
 module PacketGen::Plugin
   class NTLM
-    class Ntlmv2Response < PacketGen::Types::Fields
+    class Ntlmv2Response < BinStruct::Struct
       # @!attribute response
       #   16-byte array of unsigned char containing the client's NT challenge
       #   response.
       #   @return [String]
-      define_field :response, PacketGen::Types::String, static_length: 16
+      define_attr :response, BinStruct::String, static_length: 16
       alias ntproof_str response
       alias ntproof_str= response=
 
       # @!attribute type
       #   8-bit current version of the challenge. Should be 1.
       #   @return [Integer]
-      define_field :type, PacketGen::Types::Int8, default: 1
+      define_attr :type, BinStruct::Int8, default: 1
       # @!attribute hi_type
       #   8-bit maximum supported version of the challenge. Should be 1.
       #   @return [Integer]
-      define_field :hi_type, PacketGen::Types::Int8, default: 1
+      define_attr :hi_type, BinStruct::Int8, default: 1
       # @!attribute reserved1
       #   16-bit reserved word.
       #   @return [Integer]
-      define_field :reserved1, PacketGen::Types::Int16le
+      define_attr :reserved1, BinStruct::Int16le
       # @!attribute reserved2
       #   32-bit reserved word.
       #   @return [Integer]
-      define_field :reserved2, PacketGen::Types::Int32le
+      define_attr :reserved2, BinStruct::Int32le
       # @!attribute timestamp
       #   64-bit current system time.
       #   @return [SMB::Filetime]
-      define_field :timestamp, SMB::Filetime
+      define_attr :timestamp, SMB::Filetime
       # @!attribute client_challenge
       #   8-byte challenge from client
       #   @return [String]
-      define_field :client_challenge, PacketGen::Types::String, static_length: 8
+      define_attr :client_challenge, BinStruct::String, static_length: 8
       # @!attribute reserved3
       #   32-bit reserved word.
       #   @return [Integer]
-      define_field :reserved3, PacketGen::Types::Int32le
+      define_attr :reserved3, BinStruct::Int32le
       # @!attribute avpairs
       #   @return [ArrayOfAvPair]
-      define_field :avpairs, ArrayOfAvPair
+      define_attr :avpairs, ArrayOfAvPair
 
       # @return [false]
       def empty?