hrr_rb_ssh 0.4.0.pre2 → 0.4.0.pre3

data/lib/hrr_rb_ssh/transport/kex_algorithm/diffie_hellman/h0.rb

@@ -8,10 +8,8 @@ module HrrRbSsh
   class Transport
     class KexAlgorithm
       module DiffieHellman
-        module H0
-          class << self
-            include Codable
-          end
+        class H0
+          include Codable
           DEFINITION = [
             [DataType::String, :'V_C'],
             [DataType::String, :'V_S'],

data/lib/hrr_rb_ssh/transport/kex_algorithm/diffie_hellman.rb

@@ -60,7 +60,7 @@ module HrrRbSsh
             :'f'   => @f,
             :'k'   => @shared_secret,
           }
-          h0 = H0.encode h0_payload, logger: logger
+          h0 = H0.new(logger: logger).encode h0_payload
           h  = OpenSSL::Digest.digest self.class::DIGEST, h0
         end
 
@@ -70,7 +70,7 @@ module HrrRbSsh
         end
 
         def receive_kexdh_init payload
-          Message::SSH_MSG_KEXDH_INIT.decode payload, logger: logger
+          Message::SSH_MSG_KEXDH_INIT.new(logger: logger).decode payload
         end
 
         def send_kexdh_reply transport
@@ -80,7 +80,7 @@ module HrrRbSsh
             :'f'                                             => @f,
             :'signature of H'                                => sign(transport),
           }
-          payload = Message::SSH_MSG_KEXDH_REPLY.encode message, logger: logger
+          payload = Message::SSH_MSG_KEXDH_REPLY.new(logger: logger).encode message
           transport.send payload
         end
 
@@ -89,12 +89,12 @@ module HrrRbSsh
             :'message number' => Message::SSH_MSG_KEXDH_INIT::VALUE,
             :'e'              => @e,
           }
-          payload = Message::SSH_MSG_KEXDH_INIT.encode message, logger: logger
+          payload = Message::SSH_MSG_KEXDH_INIT.new(logger: logger).encode message
           transport.send payload
         end
 
         def receive_kexdh_reply payload
-          Message::SSH_MSG_KEXDH_REPLY.decode payload, logger: logger
+          Message::SSH_MSG_KEXDH_REPLY.new(logger: logger).decode payload
         end
       end
     end

data/lib/hrr_rb_ssh/transport/kex_algorithm/diffie_hellman_group_exchange/h0.rb

@@ -8,10 +8,8 @@ module HrrRbSsh
   class Transport
     class KexAlgorithm
       module DiffieHellmanGroupExchange
-        module H0
-          class << self
-            include Codable
-          end
+        class H0
+          include Codable
           DEFINITION = [
             [DataType::String, :'V_C'],
             [DataType::String, :'V_S'],

data/lib/hrr_rb_ssh/transport/kex_algorithm/diffie_hellman_group_exchange.rb

@@ -92,7 +92,7 @@ module HrrRbSsh
             :'f'   => @f,
             :'k'   => @shared_secret,
           }
-          h0 = H0.encode h0_payload, logger: logger
+          h0 = H0.new(logger: logger).encode h0_payload
           h = OpenSSL::Digest.digest self.class::DIGEST, h0
         end
 
@@ -102,7 +102,7 @@ module HrrRbSsh
         end
 
         def receive_kex_dh_gex_request payload
-          Message::SSH_MSG_KEX_DH_GEX_REQUEST.decode payload, logger: logger
+          Message::SSH_MSG_KEX_DH_GEX_REQUEST.new(logger: logger).decode payload
         end
 
         def send_kex_dh_gex_group transport
@@ -111,12 +111,12 @@ module HrrRbSsh
             :'p'              => @p,
             :'g'              => @g,
           }
-          payload = Message::SSH_MSG_KEX_DH_GEX_GROUP.encode message, logger: logger
+          payload = Message::SSH_MSG_KEX_DH_GEX_GROUP.new(logger: logger).encode message
           transport.send payload
         end
 
         def receive_kex_dh_gex_init payload
-          Message::SSH_MSG_KEX_DH_GEX_INIT.decode payload, logger: logger
+          Message::SSH_MSG_KEX_DH_GEX_INIT.new(logger: logger).decode payload
         end
 
         def send_kex_dh_gex_reply transport
@@ -126,7 +126,7 @@ module HrrRbSsh
             :'f'                                             => @f,
             :'signature of H'                                => sign(transport),
           }
-          payload = Message::SSH_MSG_KEX_DH_GEX_REPLY.encode message, logger: logger
+          payload = Message::SSH_MSG_KEX_DH_GEX_REPLY.new(logger: logger).encode message
           transport.send payload
         end
 
@@ -137,12 +137,12 @@ module HrrRbSsh
             :'n'              => @n,
             :'max'            => @max,
           }
-          payload = Message::SSH_MSG_KEX_DH_GEX_REQUEST.encode message, logger: logger
+          payload = Message::SSH_MSG_KEX_DH_GEX_REQUEST.new(logger: logger).encode message
           transport.send payload
         end
 
         def receive_kex_dh_gex_group payload
-          Message::SSH_MSG_KEX_DH_GEX_GROUP.decode payload, logger: logger
+          Message::SSH_MSG_KEX_DH_GEX_GROUP.new(logger: logger).decode payload
         end
 
         def send_kex_dh_gex_init transport
@@ -150,12 +150,12 @@ module HrrRbSsh
             :'message number' => Message::SSH_MSG_KEX_DH_GEX_INIT::VALUE,
             :'e'              => @e,
           }
-          payload = Message::SSH_MSG_KEX_DH_GEX_INIT.encode message, logger: logger
+          payload = Message::SSH_MSG_KEX_DH_GEX_INIT.new(logger: logger).encode message
           transport.send payload
         end
 
         def receive_kex_dh_gex_reply payload
-          Message::SSH_MSG_KEX_DH_GEX_REPLY.decode payload, logger: logger
+          Message::SSH_MSG_KEX_DH_GEX_REPLY.new(logger: logger).decode payload
         end
       end
     end

data/lib/hrr_rb_ssh/transport/kex_algorithm/elliptic_curve_diffie_hellman/h0.rb

@@ -8,10 +8,8 @@ module HrrRbSsh
   class Transport
     class KexAlgorithm
       module EllipticCurveDiffieHellman
-        module H0
-          class << self
-            include Codable
-          end
+        class H0
+          include Codable
           DEFINITION = [
             [DataType::String, :'V_C'],
             [DataType::String, :'V_S'],

data/lib/hrr_rb_ssh/transport/kex_algorithm/elliptic_curve_diffie_hellman.rb

@@ -54,7 +54,7 @@ module HrrRbSsh
             :'Q_S' => @q_s,
             :'K'   => @shared_secret,
           }
-          h0 = H0.encode h0_payload, logger: logger
+          h0 = H0.new(logger: logger).encode h0_payload
           h  = OpenSSL::Digest.digest self.class::DIGEST, h0
         end
 
@@ -64,7 +64,7 @@ module HrrRbSsh
         end
 
         def receive_kexecdh_init payload
-          Message::SSH_MSG_KEXECDH_INIT.decode payload, logger: logger
+          Message::SSH_MSG_KEXECDH_INIT.new(logger: logger).decode payload
         end
 
         def send_kexecdh_reply transport
@@ -74,7 +74,7 @@ module HrrRbSsh
             :'Q_S'            => @q_s,
             :'signature of H' => sign(transport),
           }
-          payload = Message::SSH_MSG_KEXECDH_REPLY.encode message, logger: logger
+          payload = Message::SSH_MSG_KEXECDH_REPLY.new(logger: logger).encode message
           transport.send payload
         end
 
@@ -83,12 +83,12 @@ module HrrRbSsh
             :'message number' => Message::SSH_MSG_KEXECDH_INIT::VALUE,
             :'Q_C'            => @q_c,
           }
-          payload = Message::SSH_MSG_KEXECDH_INIT.encode message, logger: logger
+          payload = Message::SSH_MSG_KEXECDH_INIT.new(logger: logger).encode message
           transport.send payload
         end
 
         def receive_kexecdh_reply payload
-          Message::SSH_MSG_KEXECDH_REPLY.decode payload, logger: logger
+          Message::SSH_MSG_KEXECDH_REPLY.new(logger: logger).decode payload
         end
       end
     end

data/lib/hrr_rb_ssh/transport.rb

@@ -110,21 +110,21 @@ module HrrRbSsh
           payload = @receiver.receive self
           case payload[0,1].unpack("C")[0]
           when Message::SSH_MSG_DISCONNECT::VALUE
-            message = Message::SSH_MSG_DISCONNECT.decode payload, logger: logger
+            message = Message::SSH_MSG_DISCONNECT.new(logger: logger).decode payload
             log_debug { "received disconnect message: #{message.inspect}" }
             @disconnected = true
             close
             raise Error::ClosedTransport
           when Message::SSH_MSG_IGNORE::VALUE
-            message = Message::SSH_MSG_IGNORE.decode payload, logger: logger
+            message = Message::SSH_MSG_IGNORE.new(logger: logger).decode payload
             log_debug { "received ignore message: #{message.inspect}" }
             receive
           when Message::SSH_MSG_UNIMPLEMENTED::VALUE
-            message = Message::SSH_MSG_UNIMPLEMENTED.decode payload, logger: logger
+            message = Message::SSH_MSG_UNIMPLEMENTED.new(logger: logger).decode payload
             log_debug { "received unimplemented message: #{message.inspect}" }
             receive
           when Message::SSH_MSG_DEBUG::VALUE
-            message = Message::SSH_MSG_DEBUG.decode payload, logger: logger
+            message = Message::SSH_MSG_DEBUG.new(logger: logger).decode payload
             log_debug { "received debug message: #{message.inspect}" }
             receive
           when Message::SSH_MSG_KEXINIT::VALUE
@@ -347,7 +347,7 @@ module HrrRbSsh
         :'description'    => "disconnected by user",
         :'language tag'   => ""
       }
-      payload = Message::SSH_MSG_DISCONNECT.encode message, logger: logger
+      payload = Message::SSH_MSG_DISCONNECT.new(logger: logger).encode message
       send payload
     end
 
@@ -368,7 +368,7 @@ module HrrRbSsh
         :'first_kex_packet_follows'                => false,
         :'0 (reserved for future extension)'       => 0,
       }
-      payload = Message::SSH_MSG_KEXINIT.encode message, logger: logger
+      payload = Message::SSH_MSG_KEXINIT.new(logger: logger).encode message
       send payload
 
       case @mode
@@ -386,7 +386,7 @@ module HrrRbSsh
       when Mode::CLIENT
         @i_s = payload
       end
-      message = Message::SSH_MSG_KEXINIT.decode payload, logger: logger
+      message = Message::SSH_MSG_KEXINIT.new(logger: logger).decode payload
       update_remote_algorithms message
     end
 
@@ -394,12 +394,12 @@ module HrrRbSsh
         message = {
           :'message number' => Message::SSH_MSG_NEWKEYS::VALUE,
         }
-        payload = Message::SSH_MSG_NEWKEYS.encode message, logger: logger
+        payload = Message::SSH_MSG_NEWKEYS.new(logger: logger).encode message
         send payload
     end
 
     def receive_newkeys payload
-      message = Message::SSH_MSG_NEWKEYS.decode payload, logger: logger
+      message = Message::SSH_MSG_NEWKEYS.new(logger: logger).decode payload
     end
 
     def send_service_request
@@ -407,16 +407,16 @@ module HrrRbSsh
         :'message number' => Message::SSH_MSG_SERVICE_REQUEST::VALUE,
         :'service name' => 'ssh-userauth',
       }
-      payload = Message::SSH_MSG_SERVICE_REQUEST.encode message, logger: logger
+      payload = Message::SSH_MSG_SERVICE_REQUEST.new(logger: logger).encode message
       send payload
 
       payload = @receiver.receive self
-      message = Message::SSH_MSG_SERVICE_ACCEPT.decode payload, logger: logger
+      message = Message::SSH_MSG_SERVICE_ACCEPT.new(logger: logger).decode payload
     end
 
     def receive_service_request
       payload = @receiver.receive self
-      message = Message::SSH_MSG_SERVICE_REQUEST.decode payload, logger: logger
+      message = Message::SSH_MSG_SERVICE_REQUEST.new(logger: logger).decode payload
 
       message
     end
@@ -426,7 +426,7 @@ module HrrRbSsh
         :'message number' => Message::SSH_MSG_SERVICE_ACCEPT::VALUE,
         :'service name'   => service_name,
       }
-      payload = Message::SSH_MSG_SERVICE_ACCEPT.encode message, logger: logger
+      payload = Message::SSH_MSG_SERVICE_ACCEPT.new(logger: logger).encode message
       send payload
     end
 

data/lib/hrr_rb_ssh/version.rb

@@ -2,5 +2,5 @@
 # vim: et ts=2 sw=2
 
 module HrrRbSsh
-  VERSION = "0.4.0.pre2"
+  VERSION = "0.4.0.pre3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hrr_rb_ssh
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre2
+  version: 0.4.0.pre3
 platform: ruby
 authors:
 - hirura