lib/noise/state/handshake_state.rb in noise-ruby-0.8.4 vs lib/noise/state/handshake_state.rb in noise-ruby-0.9.4

@@ -44,41 +44,41 @@
         end
 
         # Sets message_patterns to the message patterns from handshake_pattern
         @message_patterns = @protocol.pattern.tokens.dup
 
-        @protocol.pattern.initiator_pre_messages&.map do |message|
-          keypair = initiator_keypair_getter.call(message)
+        @protocol.pattern.initiator_pre_messages&.map do |token|
+          keypair = initiator_keypair_getter.call(token)
           @symmetric_state.mix_hash(keypair)
         end
 
         if @protocol.pattern.fallback
           message = @message_patterns.delete_at(0).first
           public_key = initiator_keypair_getter.call(message)
           @symmetric_state.mix_hash(public_key)
         end
 
-        @protocol.pattern.responder_pre_messages&.map do |message|
-          keypair = responder_keypair_getter.call(message)
+        @protocol.pattern.responder_pre_messages&.map do |token|
+          keypair = responder_keypair_getter.call(token)
           @symmetric_state.mix_hash(keypair)
         end
       end
 
       def expected_message_length(payload_size)
         has_key = @symmetric_state.cipher_state.key?
         pattern = @message_patterns.first
-        len = pattern.inject(0) do |len, token|
+        len = pattern.inject(0) do |l, token|
           case token
           when 'e'
-            len += @protocol.dh_fn.dhlen
+            l += @protocol.dh_fn.dhlen
             has_key = true if @protocol.psk_handshake?
           when 's'
-            len += @protocol.dh_fn.dhlen
-            len += 16 if has_key
+            l += @protocol.dh_fn.dhlen
+            l += 16 if has_key
           when 'ee', 'es', 'se', 'ss', 'psk'
             has_key = true
           end
-          len
+          l
         end
         len += payload_size
         len += 16 if has_key
         len
       end