diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-02-11 03:56:32 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-02-11 03:58:57 +0100 |
| commit | e4c918a6c721410792b287c9fd21356a1bed5805 (patch) | |
| tree | 02bad6311c2e56a04681076f449438e510e71bcc /sshd_config.5 | |
| parent | upstream commit (diff) | |
| download | openssh-e4c918a6c721410792b287c9fd21356a1bed5805.tar.xz openssh-e4c918a6c721410792b287c9fd21356a1bed5805.zip | |
upstream commit
sync crypto algorithm lists in ssh_config(5) and
sshd_config(5) with current reality. bz#2527
Upstream-ID: d7fd1b6c1ed848d866236bcb1d7049d2bb9b2ff6
Diffstat (limited to '')
| -rw-r--r-- | sshd_config.5 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index c8444610b..fa5cff2fb 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.216 2016/02/05 02:37:56 djm Exp $ -.Dd $Mdocdate: February 5 2016 $ +.\" $OpenBSD: sshd_config.5,v 1.217 2016/02/11 02:56:32 djm Exp $ +.Dd $Mdocdate: February 11 2016 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -664,7 +664,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, -ssh-ed25519,ssh-rsa +ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa .Ed .Pp The @@ -759,7 +759,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, -ssh-ed25519,ssh-rsa +ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa .Ed .Pp The list of available key types may also be obtained using the @@ -1027,8 +1027,9 @@ The default is: .Bd -literal -offset indent umac-64-etm@openssh.com,umac-128-etm@openssh.com, hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com, +hmac-sha1-etm@openssh.com, umac-64@openssh.com,umac-128@openssh.com, -hmac-sha2-256,hmac-sha2-512 +hmac-sha2-256,hmac-sha2-512,hmac-sha1 .Ed .Pp The list of available MAC algorithms may also be obtained using the @@ -1363,7 +1364,7 @@ ecdsa-sha2-nistp521-cert-v01@openssh.com, ssh-ed25519-cert-v01@openssh.com, ssh-rsa-cert-v01@openssh.com, ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521, -ssh-ed25519,ssh-rsa +ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ssh-rsa .Ed .Pp The |