diff options
| -rw-r--r-- | lib/net/ssh/buffer.rb | 2 | ||||
| -rw-r--r-- | lib/net/ssh/transport/cipher_factory.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/net/ssh/buffer.rb b/lib/net/ssh/buffer.rb index c17da78..1ee8a0a 100644 --- a/lib/net/ssh/buffer.rb +++ b/lib/net/ssh/buffer.rb @@ -255,7 +255,7 @@ module Net; module SSH key.e = read_bignum key.n = read_bignum - when /^ecdsa\-sha2\-(\w*)$/ + when /^ecdsa\-sha2\-(\w*)$/, /^ssh-ed25519(-cert-v01@openssh.com)?$/ unless defined?(OpenSSL::PKey::EC) raise NotImplementedError, "unsupported key type `#{type}'" else diff --git a/lib/net/ssh/transport/cipher_factory.rb b/lib/net/ssh/transport/cipher_factory.rb index 4d9ab45..912079e 100644 --- a/lib/net/ssh/transport/cipher_factory.rb +++ b/lib/net/ssh/transport/cipher_factory.rb @@ -41,6 +41,9 @@ module Net; module SSH; module Transport "camellia192-ctr@openssh.org" => "camellia-192-ecb", "camellia256-ctr@openssh.org" => "camellia-256-ecb", + "aes256-gcm@openssh.com" => "aes-256-gcm", + "aes128-gcm@openssh.com" => "aes-128-gcm", + "none" => "none", } |