diff options
| author | Thom May <thom@may.lt> | 2017-12-15 10:10:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 10:10:44 +0000 |
| commit | 1c487ab5977446746f9b389e429707ec8142b063 (patch) | |
| tree | 743317cfc172042acbf181b5d2fae5b4339b0d33 | |
| parent | 61a308ece615ecd2d45062a3d314474f50565e66 (diff) | |
| parent | c3a071cfe42e13866adc6fdfb19a977e9f1a0b4d (diff) | |
| download | chef-1c487ab5977446746f9b389e429707ec8142b063.tar.gz | |
Merge pull request #6677 from chef/fedora_travis
Remove the ciphers that openSSH 7.6 doesn't support
| -rw-r--r-- | kitchen-tests/Berksfile.lock | 4 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/base/attributes/default.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index a59de006ed..a674d706d6 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -53,6 +53,6 @@ GRAPH sudo (4.0.0) ubuntu (2.0.1) apt (>= 0.0.0) - users (5.2.2) - windows (3.4.0) + users (5.3.0) + windows (3.4.1) ohai (>= 4.0.0) diff --git a/kitchen-tests/cookbooks/base/attributes/default.rb b/kitchen-tests/cookbooks/base/attributes/default.rb index 84cada26ae..c952f0887e 100644 --- a/kitchen-tests/cookbooks/base/attributes/default.rb +++ b/kitchen-tests/cookbooks/base/attributes/default.rb @@ -27,7 +27,7 @@ default["openssh"]["client"]["strict_host_key_checking"] = "no" default["openssh"]["client"]["protocol"] = "2" # it is mostly important that the aes*-ctr ciphers appear first in this list, the cbc ciphers are for compatibility -default["openssh"]["server"]["ciphers"] = "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,blowfish-cbc,3des-cbc,cast128-cbc" +default["openssh"]["server"]["ciphers"] = "aes256-ctr,aes192-ctr,aes128-ctr,aes256-cbc,aes192-cbc,aes128-cbc,3des-cbc" # DNS causes long timeouts when connecting clients have busted DNS default["openssh"]["server"]["use_dns"] = "no" default["openssh"]["server"]["syslog_facility"] = "AUTH" |