Merge branch 'jb44691' into 'master'

Re-enable chacha20-poly cipher. See merge request mer-core/openssh!17
sailfishos · Dec 10, 2019 · 34809df · 34809df
2 parents 9a697e8 + 58ee110
commit 34809df
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/rpm/ssh_config b/rpm/ssh_config
@@ -44,9 +44,3 @@
 #   VisualHostKey no
 #   ProxyCommand ssh -q -W %h:%p gateway.example.com
 #   RekeyLimit 1G 1h
-
-# Cipher chacha20-poly1305@openssh.com causes connection error with openssh
-# compiled with gcc 4.9.4: "message authentication code incorrect".
-# This is probably a compiler/openssh bug but as a workaround drop the
-# chacha cipher from supported list for now (see JB#44920).
-Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc
diff --git a/rpm/sshd_config b/rpm/sshd_config
@@ -22,12 +22,6 @@ HostKey /etc/ssh/ssh_host_ed25519_key
 # Ciphers and keying
 #RekeyLimit default none
 
-# Cipher chacha20-poly1305@openssh.com causes connection error with openssh
-# compiled with gcc 4.9.4: "message authentication code incorrect".
-# This is probably a compiler/openssh bug but as a workaround drop the
-# chacha cipher from supported list for now (see JB#44920).
-Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com
-
 # Logging
 #SyslogFacility AUTH
 #LogLevel INFO