diff options
| author | des <des@FreeBSD.org> | 2004-02-26 10:24:07 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-02-26 10:24:07 +0000 |
| commit | 85717525b03cf8d4007682bd940f35f17fa95d51 (patch) | |
| tree | 4a957939f2302ec8acad51cc3945542a02488dbf /crypto/openssh | |
| parent | 3dc2c6ac8ecbe56fa7119a7a18b79ee76a55b93e (diff) | |
| download | FreeBSD-src-85717525b03cf8d4007682bd940f35f17fa95d51.zip FreeBSD-src-85717525b03cf8d4007682bd940f35f17fa95d51.tar.gz | |
Pull asbesthos underpants on and disable protocol version 1 by default.
Diffstat (limited to 'crypto/openssh')
| -rw-r--r-- | crypto/openssh/servconf.c | 2 | ||||
| -rw-r--r-- | crypto/openssh/sshd_config | 2 | ||||
| -rw-r--r-- | crypto/openssh/sshd_config.5 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index c7c1c35..7708bc7 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -115,7 +115,7 @@ fill_default_server_options(ServerOptions *options) /* Standard Options */ 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) { /* fill default hostkeys for protocols */ if (options->protocol & SSH_PROTO_1) diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index 7dedb84..2f2844d 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -17,7 +17,7 @@ #VersionAddendum FreeBSD-20040106 #Port 22 -#Protocol 2,1 +#Protocol 2 #ListenAddress 0.0.0.0 #ListenAddress :: diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index cf14589..bf0c767 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -548,7 +548,7 @@ and .Dq 2 . Multiple versions must be comma-separated. The default is -.Dq 2,1 . +.Dq 2 . Note that the order of the protocol list does not indicate preference, because the client selects among multiple protocol versions offered by the server. |
