mirror of git://anongit.mindrot.org/openssh.git
upstream: mlkem768x25519-sha256 has been promoted to default key
exchange OpenBSD-Commit-ID: 5a3259a193fd42108a869ebf650b95b5f2d08dcf
This commit is contained in:
parent
3af1dba138
commit
ae566d51b6
|
@ -33,8 +33,8 @@
|
||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: ssh_config.5,v 1.404 2024/10/18 05:53:26 djm Exp $
|
.\" $OpenBSD: ssh_config.5,v 1.405 2024/10/25 21:53:24 naddy Exp $
|
||||||
.Dd $Mdocdate: October 18 2024 $
|
.Dd $Mdocdate: October 25 2024 $
|
||||||
.Dt SSH_CONFIG 5
|
.Dt SSH_CONFIG 5
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
|
@ -1286,8 +1286,8 @@ default set.
|
||||||
.Pp
|
.Pp
|
||||||
The default is:
|
The default is:
|
||||||
.Bd -literal -offset indent
|
.Bd -literal -offset indent
|
||||||
sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
|
|
||||||
mlkem768x25519-sha256,
|
mlkem768x25519-sha256,
|
||||||
|
sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
|
||||||
curve25519-sha256,curve25519-sha256@libssh.org,
|
curve25519-sha256,curve25519-sha256@libssh.org,
|
||||||
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
|
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
|
||||||
diffie-hellman-group-exchange-sha256,
|
diffie-hellman-group-exchange-sha256,
|
||||||
|
|
|
@ -33,8 +33,8 @@
|
||||||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
.\"
|
.\"
|
||||||
.\" $OpenBSD: sshd_config.5,v 1.377 2024/10/18 04:11:54 djm Exp $
|
.\" $OpenBSD: sshd_config.5,v 1.378 2024/10/25 21:53:24 naddy Exp $
|
||||||
.Dd $Mdocdate: October 18 2024 $
|
.Dd $Mdocdate: October 25 2024 $
|
||||||
.Dt SSHD_CONFIG 5
|
.Dt SSHD_CONFIG 5
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
|
@ -1059,8 +1059,8 @@ sntrup761x25519-sha512@openssh.com
|
||||||
.Pp
|
.Pp
|
||||||
The default is:
|
The default is:
|
||||||
.Bd -literal -offset indent
|
.Bd -literal -offset indent
|
||||||
sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
|
|
||||||
mlkem768x25519-sha256,
|
mlkem768x25519-sha256,
|
||||||
|
sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
|
||||||
curve25519-sha256,curve25519-sha256@libssh.org,
|
curve25519-sha256,curve25519-sha256@libssh.org,
|
||||||
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521
|
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521
|
||||||
.Ed
|
.Ed
|
||||||
|
|
Loading…
Reference in New Issue