diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-05-07 23:12:57 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:21:00 +1000 |
commit | acaf34fd823235d549c633c0146ee03ac5956e82 (patch) | |
tree | b6e350c58134d35c9a51533349404ee1463192eb /sshd_config.5 | |
parent | 3e371bd2124427403971db853fb2e36ce789b6fd (diff) |
upstream commit
As promised in last release announcement: remove
support for Blowfish, RC4 and CAST ciphers. ok markus@ deraadt@
Upstream-ID: 21f8facdba3fd8da248df6417000867cec6ba222
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index ac6ccc793..7ccf6fd4e 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.243 2017/03/14 07:19:07 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.244 2017/05/07 23:12:57 djm Exp $ |
37 | .Dd $Mdocdate: March 14 2017 $ | 37 | .Dd $Mdocdate: May 7 2017 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -464,16 +464,6 @@ aes128-gcm@openssh.com | |||
464 | .It | 464 | .It |
465 | aes256-gcm@openssh.com | 465 | aes256-gcm@openssh.com |
466 | .It | 466 | .It |
467 | arcfour | ||
468 | .It | ||
469 | arcfour128 | ||
470 | .It | ||
471 | arcfour256 | ||
472 | .It | ||
473 | blowfish-cbc | ||
474 | .It | ||
475 | cast128-cbc | ||
476 | .It | ||
477 | chacha20-poly1305@openssh.com | 467 | chacha20-poly1305@openssh.com |
478 | .El | 468 | .El |
479 | .Pp | 469 | .Pp |
@@ -962,8 +952,6 @@ hmac-md5 | |||
962 | .It | 952 | .It |
963 | hmac-md5-96 | 953 | hmac-md5-96 |
964 | .It | 954 | .It |
965 | hmac-ripemd160 | ||
966 | .It | ||
967 | hmac-sha1 | 955 | hmac-sha1 |
968 | .It | 956 | .It |
969 | hmac-sha1-96 | 957 | hmac-sha1-96 |
@@ -980,8 +968,6 @@ hmac-md5-etm@openssh.com | |||
980 | .It | 968 | .It |
981 | hmac-md5-96-etm@openssh.com | 969 | hmac-md5-96-etm@openssh.com |
982 | .It | 970 | .It |
983 | hmac-ripemd160-etm@openssh.com | ||
984 | .It | ||
985 | hmac-sha1-etm@openssh.com | 971 | hmac-sha1-etm@openssh.com |
986 | .It | 972 | .It |
987 | hmac-sha1-96-etm@openssh.com | 973 | hmac-sha1-96-etm@openssh.com |