mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-03-21 18:56:28 +00:00
upstream: ssh: document sntrup761x25519-sha512@openssh.com as
default KEX OpenBSD-Commit-ID: 12545bfa10bcbf552d04d9d9520d0f4e98b0e171
This commit is contained in:
parent
9ec2713d12
commit
a9f23ea2e3
@ -33,7 +33,7 @@
|
|||||||
.\" (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.370 2022/03/31 17:27:27 naddy Exp $
|
.\" $OpenBSD: ssh_config.5,v 1.371 2022/03/31 17:58:44 naddy Exp $
|
||||||
.Dd $Mdocdate: March 31 2022 $
|
.Dd $Mdocdate: March 31 2022 $
|
||||||
.Dt SSH_CONFIG 5
|
.Dt SSH_CONFIG 5
|
||||||
.Os
|
.Os
|
||||||
@ -1165,9 +1165,9 @@ character, then the specified algorithms will be placed at the head of the
|
|||||||
default set.
|
default set.
|
||||||
The default is:
|
The default is:
|
||||||
.Bd -literal -offset indent
|
.Bd -literal -offset indent
|
||||||
|
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,
|
||||||
sntrup761x25519-sha512@openssh.com,
|
|
||||||
diffie-hellman-group-exchange-sha256,
|
diffie-hellman-group-exchange-sha256,
|
||||||
diffie-hellman-group16-sha512,
|
diffie-hellman-group16-sha512,
|
||||||
diffie-hellman-group18-sha512,
|
diffie-hellman-group18-sha512,
|
||||||
|
@ -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.339 2021/12/04 00:05:39 naddy Exp $
|
.\" $OpenBSD: sshd_config.5,v 1.340 2022/03/31 17:58:44 naddy Exp $
|
||||||
.Dd $Mdocdate: December 4 2021 $
|
.Dd $Mdocdate: March 31 2022 $
|
||||||
.Dt SSHD_CONFIG 5
|
.Dt SSHD_CONFIG 5
|
||||||
.Os
|
.Os
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -961,9 +961,9 @@ sntrup761x25519-sha512@openssh.com
|
|||||||
.Pp
|
.Pp
|
||||||
The default is:
|
The default is:
|
||||||
.Bd -literal -offset indent
|
.Bd -literal -offset indent
|
||||||
|
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,
|
||||||
sntrup761x25519-sha512@openssh.com,
|
|
||||||
diffie-hellman-group-exchange-sha256,
|
diffie-hellman-group-exchange-sha256,
|
||||||
diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,
|
diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,
|
||||||
diffie-hellman-group14-sha256
|
diffie-hellman-group14-sha256
|
||||||
|
Loading…
Reference in New Issue
Block a user