summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMiklós Fazekas <mfazekas@szemafor.com>2020-04-25 16:30:02 +0200
committerMiklos Fazekas <mfazekas@szemafor.com>2020-04-25 16:41:11 +0200
commitccb874c470977edc7d198f62cc844cce1e1893be (patch)
treef39132c3e46d29526748e283b7ddf23f87e9008a /lib
parenta6db052118693a6b4d7bbd2fe7e122f41ae8b10d (diff)
downloadnet-ssh-revert-757-opt-in-etm-hmac.tar.gz
Revert "Make hmac-sha2-{256,512}-etm opt-in"revert-757-opt-in-etm-hmac
Diffstat (limited to 'lib')
-rw-r--r--lib/net/ssh/transport/algorithms.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/net/ssh/transport/algorithms.rb b/lib/net/ssh/transport/algorithms.rb
index c03c92a..8126aa6 100644
--- a/lib/net/ssh/transport/algorithms.rb
+++ b/lib/net/ssh/transport/algorithms.rb
@@ -43,7 +43,8 @@ module Net
encryption: %w[aes256-ctr aes192-ctr aes128-ctr],
- hmac: %w[hmac-sha2-512 hmac-sha2-256
+ hmac: %w[hmac-sha2-512-etm@openssh.com hmac-sha2-256-etm@openssh.com
+ hmac-sha2-512 hmac-sha2-256
hmac-sha1]
}.freeze
@@ -83,9 +84,7 @@ module Net
hmac-sha1-96
hmac-ripemd160 hmac-ripemd160@openssh.com
hmac-md5 hmac-md5-96
- none] +
- %w[hmac-sha2-256-etm@openssh.com
- hmac-sha2-512-etm@openssh.com],
+ none],
compression: %w[none zlib@openssh.com zlib],
language: %w[]