hrr_rb_ssh 0.3.1 → 0.4.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 045cac2e290061c0575c6a2f4d09e6c9ae4d45cadb5a82ed7f73ac440b97e9e9
-  data.tar.gz: 7ed94a74123486946cf35c6308af08e64fb8bda1108256a8390aecc46f4c67b1
+  metadata.gz: bab944f20759d7530c45a2b305e75786a1550434acd505a92042a49631447065
+  data.tar.gz: 4c57b3e6df49eecc99b8e3415915df6c58827fd7c79030bdeaee8c397a00b302
 SHA512:
-  metadata.gz: ed149cc2cba4cc2884c571ee11eb453b23ec593498a0f5ff0a3cb95c3d4cb36286c9559466210a7b9c336e2167b97bea87504e00d029d996a92d655de6f9beff
-  data.tar.gz: 76b80ab7c6635df3e9286d1a1203674d03e83209f577dce22c00d30d21042a727af22e1ed457943e7b54bf0843ebd0e184bb3ac240929ef0447a7356888d8516
+  metadata.gz: a725f5873e844406368f9958308ea95ed1a755a35cada1af968ae1c5c642d890483ca51eaf39f1512403ff7eda7da7760ee93f041a02e42c105a7d32517d5ff5
+  data.tar.gz: 7c594a07bddba8a7068c99ddee48a1188cf0d63bf7210307acc872b8d162103b5b6e39aa848f1547bfad7a7abc3f92c5720ed626b1970af8eb5aa02fedefad69

data/.travis.yml

@@ -11,6 +11,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
 os:
   - linux

data/README.md

@@ -9,6 +9,8 @@ hrr_rb_ssh is a pure Ruby SSH 2.0 server and client implementation.
 
 With hrr_rb_ssh, it is possible to write an SSH server easily, and also possible to write an original server side application on secure connection provided by SSH protocol. And it supports to write SSH client as well.
 
+NOTE: ED25519 public key algorithm is now separated from hrr_rb_ssh. Please refer to [hrr_rb_ssh-ed25519](https://github.com/hirura/hrr_rb_ssh-ed25519).
+
 ## Table of Contents
 
 - [Installation](#installation)
@@ -389,9 +391,9 @@ p HrrRbSsh::Transport::EncryptionAlgorithm.list_preferred
 # => ["aes128-ctr", "aes192-ctr", "aes256-ctr", "aes128-cbc", "3des-cbc", "blowfish-cbc", "cast128-cbc", "aes192-cbc", "aes256-cbc", "arcfour"]
 
 p HrrRbSsh::Transport::ServerHostKeyAlgorithm.list_supported
-# => ["ssh-dss", "ssh-rsa", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "ssh-ed25519"]
+# => ["ssh-dss", "ssh-rsa", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521"]
 p HrrRbSsh::Transport::ServerHostKeyAlgorithm.list_preferred
-# => ["ssh-ed25519", "ecdsa-sha2-nistp521", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp256", "ssh-rsa", "ssh-dss"]
+# => ["ecdsa-sha2-nistp521", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp256", "ssh-rsa", "ssh-dss"]
 
 p HrrRbSsh::Transport::KexAlgorithm.list_supported
 # => ["diffie-hellman-group1-sha1", "diffie-hellman-group14-sha1", "diffie-hellman-group-exchange-sha1", "diffie-hellman-group-exchange-sha256", "diffie-hellman-group14-sha256", "diffie-hellman-group15-sha512", "diffie-hellman-group16-sha512", "diffie-hellman-group17-sha512", "diffie-hellman-group18-sha512", "ecdh-sha2-nistp256", "ecdh-sha2-nistp384", "ecdh-sha2-nistp521"]
@@ -521,7 +523,6 @@ The following features are currently supported.
     - ecdsa-sha2-nistp256
     - ecdsa-sha2-nistp384
     - ecdsa-sha2-nistp521
-    - ssh-ed25519
 - Keyboard interactive (generic interactive / challenge response) authentication
 
 ### Transport layer
@@ -544,7 +545,6 @@ The following features are currently supported.
     - ecdsa-sha2-nistp256
     - ecdsa-sha2-nistp384
     - ecdsa-sha2-nistp521
-    - ssh-ed25519
 - Kex algorithm
     - diffie-hellman-group1-sha1
     - diffie-hellman-group14-sha1

data/demo/server.rb

@@ -18,7 +18,7 @@ def start_service io, logger=nil
   HrrRbSsh::Logger.initialize logger if logger
 
   tran_preferred_encryption_algorithms      = %w(aes128-ctr aes192-ctr aes256-ctr aes128-cbc 3des-cbc blowfish-cbc cast128-cbc aes192-cbc aes256-cbc arcfour)
-  tran_preferred_server_host_key_algorithms = %w(ssh-ed25519 ecdsa-sha2-nistp521 ecdsa-sha2-nistp384 ecdsa-sha2-nistp256 ssh-rsa ssh-dss)
+  tran_preferred_server_host_key_algorithms = %w(ecdsa-sha2-nistp521 ecdsa-sha2-nistp384 ecdsa-sha2-nistp256 ssh-rsa ssh-dss)
   tran_preferred_kex_algorithms             = %w(ecdh-sha2-nistp521 ecdh-sha2-nistp384 ecdh-sha2-nistp256 diffie-hellman-group14-sha1 diffie-hellman-group1-sha1)
   tran_preferred_mac_algorithms             = %w(hmac-sha2-512 hmac-sha2-256 hmac-sha1 hmac-md5 hmac-sha1-96 hmac-md5-96)
   tran_preferred_compression_algorithms     = %w(none zlib)

data/hrr_rb_ssh.gemspec

@@ -22,8 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency "ed25519", "~> 1.2"
-
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.16"

data/lib/hrr_rb_ssh/algorithm/publickey.rb

@@ -19,4 +19,3 @@ require 'hrr_rb_ssh/algorithm/publickey/ssh_rsa'
 require 'hrr_rb_ssh/algorithm/publickey/ecdsa_sha2_nistp256'
 require 'hrr_rb_ssh/algorithm/publickey/ecdsa_sha2_nistp384'
 require 'hrr_rb_ssh/algorithm/publickey/ecdsa_sha2_nistp521'
-require 'hrr_rb_ssh/algorithm/publickey/ssh_ed25519'

data/lib/hrr_rb_ssh/authentication/method/publickey/algorithm.rb

@@ -23,4 +23,3 @@ require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_rsa'
 require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ecdsa_sha2_nistp256'
 require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ecdsa_sha2_nistp384'
 require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ecdsa_sha2_nistp521'
-require 'hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_ed25519'

data/lib/hrr_rb_ssh/transport/server_host_key_algorithm.rb

@@ -19,4 +19,3 @@ require 'hrr_rb_ssh/transport/server_host_key_algorithm/ssh_rsa'
 require 'hrr_rb_ssh/transport/server_host_key_algorithm/ecdsa_sha2_nistp256'
 require 'hrr_rb_ssh/transport/server_host_key_algorithm/ecdsa_sha2_nistp384'
 require 'hrr_rb_ssh/transport/server_host_key_algorithm/ecdsa_sha2_nistp521'
-require 'hrr_rb_ssh/transport/server_host_key_algorithm/ssh_ed25519'

data/lib/hrr_rb_ssh/version.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hrr_rb_ssh
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0.pre1
 platform: ruby
 authors:
 - hirura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ed25519
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,12 +87,6 @@ files:
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_dss.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_dss/public_key_blob.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_dss/signature.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/openssh_private_key.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/openssh_private_key_content.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/pkey.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/public_key_blob.rb
-- lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/signature.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_rsa.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_rsa/public_key_blob.rb
 - lib/hrr_rb_ssh/algorithm/publickey/ssh_rsa/signature.rb
@@ -130,7 +110,6 @@ files:
 - lib/hrr_rb_ssh/authentication/method/publickey/algorithm/functionable.rb
 - lib/hrr_rb_ssh/authentication/method/publickey/algorithm/signature_blob.rb
 - lib/hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_dss.rb
-- lib/hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_ed25519.rb
 - lib/hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_rsa.rb
 - lib/hrr_rb_ssh/authentication/method/publickey/context.rb
 - lib/hrr_rb_ssh/client.rb
@@ -288,7 +267,6 @@ files:
 - lib/hrr_rb_ssh/transport/server_host_key_algorithm/ecdsa_sha2_nistp521.rb
 - lib/hrr_rb_ssh/transport/server_host_key_algorithm/functionable.rb
 - lib/hrr_rb_ssh/transport/server_host_key_algorithm/ssh_dss.rb
-- lib/hrr_rb_ssh/transport/server_host_key_algorithm/ssh_ed25519.rb
 - lib/hrr_rb_ssh/transport/server_host_key_algorithm/ssh_rsa.rb
 - lib/hrr_rb_ssh/version.rb
 homepage: https://github.com/hirura/hrr_rb_ssh
@@ -306,9 +284,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 

data/lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/openssh_private_key.rb

@@ -1,29 +0,0 @@
-# coding: utf-8
-# vim: et ts=2 sw=2
-
-require 'hrr_rb_ssh/data_type'
-require 'hrr_rb_ssh/codable'
-
-module HrrRbSsh
-  module Algorithm
-    class Publickey
-      class SshEd25519
-        module OpenSSHPrivateKey
-          class << self
-            include Codable
-          end
-          DEFINITION = [
-            [DataType::String, :'cipher'],
-            [DataType::String, :'kdfname'],
-            [DataType::Uint32, :'kdfopts'],
-            [DataType::Uint32, :'number of public keys'],
-            [DataType::Uint32, :'first public key length'],
-            [DataType::String, :'name'],
-            [DataType::String, :'public key'],
-            [DataType::String, :'content'],
-          ]
-        end
-      end
-    end
-  end
-end

data/lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/openssh_private_key_content.rb

@@ -1,26 +0,0 @@
-# coding: utf-8
-# vim: et ts=2 sw=2
-
-require 'hrr_rb_ssh/data_type'
-require 'hrr_rb_ssh/codable'
-
-module HrrRbSsh
-  module Algorithm
-    class Publickey
-      class SshEd25519
-        module OpenSSHPrivateKeyContent
-          class << self
-            include Codable
-          end
-          DEFINITION = [
-            [DataType::Uint64, :'unknown'],
-            [DataType::String, :'name'],
-            [DataType::String, :'public key'],
-            [DataType::String, :'key pair'],
-            [DataType::String, :'padding'],
-          ]
-        end
-      end
-    end
-  end
-end

data/lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/pkey.rb

@@ -1,158 +0,0 @@
-# coding: utf-8
-# vim: et ts=2 sw=2
-
-require 'stringio'
-require 'base64'
-require 'ed25519'
-
-module HrrRbSsh
-  module Algorithm
-    class Publickey
-      class SshEd25519
-        class PKey
-          class Error < ::StandardError
-          end
-
-          def initialize arg=nil
-            case arg
-            when ::Ed25519::SigningKey, ::Ed25519::VerifyKey
-              @key = arg
-            when ::String
-              @key = load_key_str arg
-            when nil
-              # do nothing
-            end
-          end
-
-          def load_key_str key_str
-            begin
-              load_openssh_key key_str
-            rescue
-              begin
-                load_openssl_key key_str
-              rescue
-                raise Error
-              end
-            end
-          end
-
-          def load_openssh_key key_str
-            begin_marker = "-----BEGIN OPENSSH PRIVATE KEY-----\n"
-            end_marker   = "-----END OPENSSH PRIVATE KEY-----\n"
-            magic        = "openssh-key-v1"
-
-            raise Error unless key_str.start_with? begin_marker
-            raise Error unless key_str.end_with? end_marker
-            decoded_key_str = Base64.decode64(key_str[begin_marker.size...-end_marker.size])
-            raise Error unless decoded_key_str[0,14] == magic
-
-            private_key_h = OpenSSHPrivateKey.decode decoded_key_str[15..-1]
-            private_key_content_h = OpenSSHPrivateKeyContent.decode private_key_h[:'content']
-            key_pair = private_key_content_h[:'key pair']
-
-            ::Ed25519::SigningKey.new(key_pair[0,32])
-          end
-
-          def load_openssl_key key_str
-            private_key_begin_marker = "-----BEGIN PRIVATE KEY-----\n"
-            public_key_begin_marker  = "-----BEGIN PUBLIC KEY-----\n"
-            if key_str.start_with? private_key_begin_marker
-              begin_marker = "-----BEGIN PRIVATE KEY-----\n"
-              end_marker   = "-----END PRIVATE KEY-----\n"
-
-              raise Error unless key_str.start_with? begin_marker
-              raise Error unless key_str.end_with? end_marker
-
-              decoded_key_str = Base64.decode64(key_str[begin_marker.size...-end_marker.size])
-              key_der = OpenSSL::ASN1.decode decoded_key_str
-
-              ::Ed25519::SigningKey.new(key_der.value[2].value[2..-1])
-            elsif key_str.start_with? public_key_begin_marker
-              begin_marker = "-----BEGIN PUBLIC KEY-----\n"
-              end_marker   = "-----END PUBLIC KEY-----\n"
-
-              raise Error unless key_str.start_with? begin_marker
-              raise Error unless key_str.end_with? end_marker
-
-              decoded_key_str = Base64.decode64(key_str[begin_marker.size...-end_marker.size])
-              key_der = OpenSSL::ASN1.decode decoded_key_str
-
-              ::Ed25519::VerifyKey.new(key_der.value[1].value)
-            else
-              raise Error
-            end
-          end
-
-          def set_public_key key_str
-            @key = ::Ed25519::VerifyKey.new(key_str)
-          end
-
-          def to_pem
-            ed25519_object_id = '1.3.101.112'
-            case @key
-=begin
-            when ::Ed25519::SigningKey
-              begin_marker = "-----BEGIN PRIVATE KEY-----\n"
-              end_marker   = "-----END PRIVATE KEY-----\n"
-              key_asn1 = OpenSSL::ASN1::Sequence.new(
-                [
-                  OpenSSL::ASN1::Integer.new(OpenSSL::BN.new(0)),
-                  OpenSSL::ASN1::Sequence.new(
-                    [
-                      OpenSSL::ASN1::ObjectId.new(ed25519_object_id),
-                    ]
-                  ),
-                  OpenSSL::ASN1::OctetString.new(@key.to_bytes),
-                ]
-              )
-=end
-            when ::Ed25519::VerifyKey
-              begin_marker = "-----BEGIN PUBLIC KEY-----\n"
-              end_marker   = "-----END PUBLIC KEY-----\n"
-              key_asn1 = OpenSSL::ASN1::Sequence.new(
-                [
-                  OpenSSL::ASN1::Sequence.new(
-                    [
-                      OpenSSL::ASN1::ObjectId.new(ed25519_object_id),
-                    ]
-                  ),
-                  OpenSSL::ASN1::BitString.new(@key.to_bytes),
-                ]
-              )
-            end
-            pem_str = Base64.encode64(key_asn1.to_der)
-            begin_marker + pem_str + end_marker
-          end
-
-          def public_key
-            case @key
-            when ::Ed25519::SigningKey
-              self.class.new @key.verify_key
-            when ::Ed25519::VerifyKey
-              self
-            end
-          end
-
-          def key_str
-            @key.to_bytes
-          end
-
-          def sign data
-            @key.sign data
-          end
-
-          def verify signature, data
-            begin
-              @key.verify signature, data
-            rescue ::Ed25519::VerifyError
-              false
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-require 'hrr_rb_ssh/algorithm/publickey/ssh_ed25519/openssh_private_key'
-require 'hrr_rb_ssh/algorithm/publickey/ssh_ed25519/openssh_private_key_content'

data/lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/public_key_blob.rb

@@ -1,23 +0,0 @@
-# coding: utf-8
-# vim: et ts=2 sw=2
-
-require 'hrr_rb_ssh/data_type'
-require 'hrr_rb_ssh/codable'
-
-module HrrRbSsh
-  module Algorithm
-    class Publickey
-      class SshEd25519
-        module PublicKeyBlob
-          class << self
-            include Codable
-          end
-          DEFINITION = [
-            [DataType::String, :'public key algorithm name'],
-            [DataType::String, :'key'],
-          ]
-        end
-      end
-    end
-  end
-end

data/lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519/signature.rb

@@ -1,23 +0,0 @@
-# coding: utf-8
-# vim: et ts=2 sw=2
-
-require 'hrr_rb_ssh/data_type'
-require 'hrr_rb_ssh/codable'
-
-module HrrRbSsh
-  module Algorithm
-    class Publickey
-      class SshEd25519
-        module Signature
-          class << self
-            include Codable
-          end
-          DEFINITION = [
-            [DataType::String, :'public key algorithm name'],
-            [DataType::String, :'signature blob'],
-          ]
-        end
-      end
-    end
-  end
-end

data/lib/hrr_rb_ssh/algorithm/publickey/ssh_ed25519.rb

@@ -1,61 +0,0 @@
-# coding: utf-8
-# vim: et ts=2 sw=2
-
-require 'hrr_rb_ssh/logger'
-
-module HrrRbSsh
-  module Algorithm
-    class Publickey
-      class SshEd25519 < Publickey
-        NAME = 'ssh-ed25519'
-
-        def initialize arg
-          begin
-            new_by_key_str arg
-          rescue PKey::Error
-            new_by_public_key_blob arg
-          end
-        end
-
-        def new_by_key_str key_str
-          @publickey = PKey.new(key_str)
-        end
-
-        def new_by_public_key_blob public_key_blob
-          public_key_blob_h = PublicKeyBlob.decode(public_key_blob)
-          @publickey = PKey.new
-          @publickey.set_public_key(public_key_blob_h[:key])
-        end
-
-        def to_pem
-          @publickey.public_key.to_pem
-        end
-
-        def to_public_key_blob
-          public_key_blob_h = {
-            :'public key algorithm name' => self.class::NAME,
-            :'key'                       => @publickey.public_key.key_str,
-          }
-          PublicKeyBlob.encode(public_key_blob_h)
-        end
-
-        def sign signature_blob
-          signature_h = {
-            :'public key algorithm name' => self.class::NAME,
-            :'signature blob'            => @publickey.sign(signature_blob),
-          }
-          Signature.encode signature_h
-        end
-
-        def verify signature, signature_blob
-          signature_h = Signature.decode signature
-          signature_h[:'public key algorithm name'] == self.class::NAME && @publickey.public_key.verify(signature_h[:'signature blob'], signature_blob)
-        end
-      end
-    end
-  end
-end
-
-require 'hrr_rb_ssh/algorithm/publickey/ssh_ed25519/pkey'
-require 'hrr_rb_ssh/algorithm/publickey/ssh_ed25519/public_key_blob'
-require 'hrr_rb_ssh/algorithm/publickey/ssh_ed25519/signature'

data/lib/hrr_rb_ssh/authentication/method/publickey/algorithm/ssh_ed25519.rb

@@ -1,21 +0,0 @@
-# coding: utf-8
-# vim: et ts=2 sw=2
-
-require 'hrr_rb_ssh/authentication/method/publickey/algorithm/functionable'
-
-module HrrRbSsh
-  class Authentication
-    class Method
-      class Publickey
-        class Algorithm
-          class SshEd25519 < Algorithm
-            NAME = 'ssh-ed25519'
-            PREFERENCE = 60
-
-            include Functionable
-          end
-        end
-      end
-    end
-  end
-end

data/lib/hrr_rb_ssh/transport/server_host_key_algorithm/ssh_ed25519.rb

@@ -1,20 +0,0 @@
-# coding: utf-8
-# vim: et ts=2 sw=2
-
-require 'ed25519'
-require 'hrr_rb_ssh/openssl_secure_random'
-require 'hrr_rb_ssh/transport/server_host_key_algorithm/functionable'
-
-module HrrRbSsh
-  class Transport
-    class ServerHostKeyAlgorithm
-      class SshEd25519 < ServerHostKeyAlgorithm
-        NAME = 'ssh-ed25519'
-        PREFERENCE = 60
-        SECRET_KEY = ::Ed25519::SigningKey.generate
-
-        include Functionable
-      end
-    end
-  end
-end