mirror of
https://git.FreeBSD.org/src.git
synced 2024-11-30 08:19:09 +00:00
Pull asbesthos underpants on and disable protocol version 1 by default.
This commit is contained in:
parent
8861f1dd53
commit
028c324ac8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=126271
@ -115,7 +115,7 @@ fill_default_server_options(ServerOptions *options)
|
|||||||
|
|
||||||
/* Standard Options */
|
/* Standard Options */
|
||||||
if (options->protocol == SSH_PROTO_UNKNOWN)
|
if (options->protocol == SSH_PROTO_UNKNOWN)
|
||||||
options->protocol = SSH_PROTO_1|SSH_PROTO_2;
|
options->protocol = SSH_PROTO_2;
|
||||||
if (options->num_host_key_files == 0) {
|
if (options->num_host_key_files == 0) {
|
||||||
/* fill default hostkeys for protocols */
|
/* fill default hostkeys for protocols */
|
||||||
if (options->protocol & SSH_PROTO_1)
|
if (options->protocol & SSH_PROTO_1)
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#VersionAddendum FreeBSD-20040106
|
#VersionAddendum FreeBSD-20040106
|
||||||
|
|
||||||
#Port 22
|
#Port 22
|
||||||
#Protocol 2,1
|
#Protocol 2
|
||||||
#ListenAddress 0.0.0.0
|
#ListenAddress 0.0.0.0
|
||||||
#ListenAddress ::
|
#ListenAddress ::
|
||||||
|
|
||||||
|
@ -548,7 +548,7 @@ and
|
|||||||
.Dq 2 .
|
.Dq 2 .
|
||||||
Multiple versions must be comma-separated.
|
Multiple versions must be comma-separated.
|
||||||
The default is
|
The default is
|
||||||
.Dq 2,1 .
|
.Dq 2 .
|
||||||
Note that the order of the protocol list does not indicate preference,
|
Note that the order of the protocol list does not indicate preference,
|
||||||
because the client selects among multiple protocol versions offered
|
because the client selects among multiple protocol versions offered
|
||||||
by the server.
|
by the server.
|
||||||
|
Loading…
Reference in New Issue
Block a user