protocol.rb in noise-ruby-0.10.1

- old
+ new

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
 module Noise
   class Protocol
-    attr_accessor :is_psk_handshake
     attr_accessor :cipher_fn, :hash_fn, :dh_fn, :hkdf_fn
     attr_reader :name, :pattern
 
     CIPHER = {
       'AESGCM': Noise::Functions::Cipher::AesGcm,
@@ -20,11 +19,11 @@
     HASH = {
       'BLAKE2b': Noise::Functions::Hash::Blake2b,
       'BLAKE2s': Noise::Functions::Hash::Blake2s,
       'SHA256': Noise::Functions::Hash::Sha256,
       'SHA512': Noise::Functions::Hash::Sha512,
-      'BLAKE3': Noise::Functions::Hash::Blake3,
+      'BLAKE3': Noise::Functions::Hash::Blake3
     }.stringify_keys.freeze
 
     def self.create(name)
       prefix, pattern_name, dh_name, cipher_name, hash_name = name.split('_')
       raise Noise::Exceptions::ProtocolNameError if prefix != 'Noise'
@@ -33,12 +32,10 @@
 
     def initialize(name, pattern_name, cipher_name, hash_name, dh_name)
       @name = name
       @pattern = Noise::Pattern.create(pattern_name)
       @hkdf_fn = Noise::Functions::Hash.create_hkdf_fn(hash_name)
-      @is_psk_handshake = @pattern.modifiers.any? { |m| m.start_with?('psk') }
-
       @pattern.apply_pattern_modifiers
 
       initialize_fn!(cipher_name, hash_name, dh_name)
     end
 
@@ -47,10 +44,10 @@
       @hash_fn = HASH[hash_name]&.new
       @dh_fn = DH[dh_name]&.new
       raise Noise::Exceptions::ProtocolNameError unless @cipher_fn && @hash_fn && @dh_fn
     end
 
-    def psk_handshake?
-      @is_psk_handshake
+    def psk?
+      @pattern.psk?
     end
   end
 end