summaryrefslogtreecommitdiffstats
path: root/sshd_config.5
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2024-08-23 01:11:30 +0200
committerDamien Miller <djm@mindrot.org>2024-08-23 01:27:35 +0200
commitaee54878255d71bf93aa6e91bbd4eb1825c0d1b9 (patch)
treeca7e56b792a5d5e9db7d97f43293642f7d18bf5d /sshd_config.5
parentMove rekey test into valgrind-2. (diff)
downloadopenssh-aee54878255d71bf93aa6e91bbd4eb1825c0d1b9.tar.xz
openssh-aee54878255d71bf93aa6e91bbd4eb1825c0d1b9.zip
upstream: sntrup761x25519-sha512 now has an IANA codepoint assigned, so
we can make the algorithm available without the @openssh.com suffix too. ok markus@ deraadt@ OpenBSD-Commit-ID: eeed8fcde688143a737729d3d56d20ab4353770f
Diffstat (limited to 'sshd_config.5')
-rw-r--r--sshd_config.58
1 files changed, 5 insertions, 3 deletions
diff --git a/sshd_config.5 b/sshd_config.5
index a0e769981..587a90334 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.368 2024/07/26 15:24:49 naddy Exp $
-.Dd $Mdocdate: July 26 2024 $
+.\" $OpenBSD: sshd_config.5,v 1.369 2024/08/22 23:11:30 djm Exp $
+.Dd $Mdocdate: August 22 2024 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -1050,12 +1050,14 @@ ecdh-sha2-nistp384
.It
ecdh-sha2-nistp521
.It
+sntrup761x25519-sha512
+.It
sntrup761x25519-sha512@openssh.com
.El
.Pp
The default is:
.Bd -literal -offset indent
-sntrup761x25519-sha512@openssh.com,
+sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
curve25519-sha256,curve25519-sha256@libssh.org,
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
diffie-hellman-group-exchange-sha256,