diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sshd_config | 8 |
2 files changed, 13 insertions, 3 deletions
@@ -6,6 +6,12 @@ | |||
6 | loaded, which makes ChallengeResponse default to yes again. This | 6 | loaded, which makes ChallengeResponse default to yes again. This |
7 | was broken by the Match changes and not fixed properly subsequently. | 7 | was broken by the Match changes and not fixed properly subsequently. |
8 | Found by okan at demirmen.com, ok djm@ "please do it" deraadt@ | 8 | Found by okan at demirmen.com, ok djm@ "please do it" deraadt@ |
9 | - djm@cvs.openbsd.org 2007/03/19 01:01:29 | ||
10 | [sshd_config] | ||
11 | Disable the legacy SSH protocol 1 for new installations via | ||
12 | a configuration override. In the future, we will change the | ||
13 | server's default itself so users who need the legacy protocol | ||
14 | will need to turn it on explicitly | ||
9 | 15 | ||
10 | 20070313 | 16 | 20070313 |
11 | - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include | 17 | - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include |
@@ -2835,4 +2841,4 @@ | |||
2835 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2841 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2836 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2842 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2837 | 2843 | ||
2838 | $Id: ChangeLog,v 1.4641 2007/03/21 09:38:53 dtucker Exp $ | 2844 | $Id: ChangeLog,v 1.4642 2007/03/21 09:42:24 dtucker Exp $ |
diff --git a/sshd_config b/sshd_config index 6a3cad886..3393cec50 100644 --- a/sshd_config +++ b/sshd_config | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sshd_config,v 1.74 2006/07/19 13:07:10 dtucker Exp $ | 1 | # $OpenBSD: sshd_config,v 1.75 2007/03/19 01:01:29 djm Exp $ |
2 | 2 | ||
3 | # This is the sshd server system-wide configuration file. See | 3 | # This is the sshd server system-wide configuration file. See |
4 | # sshd_config(5) for more information. | 4 | # sshd_config(5) for more information. |
@@ -11,11 +11,15 @@ | |||
11 | # default value. | 11 | # default value. |
12 | 12 | ||
13 | #Port 22 | 13 | #Port 22 |
14 | #Protocol 2,1 | ||
15 | #AddressFamily any | 14 | #AddressFamily any |
16 | #ListenAddress 0.0.0.0 | 15 | #ListenAddress 0.0.0.0 |
17 | #ListenAddress :: | 16 | #ListenAddress :: |
18 | 17 | ||
18 | # Disable legacy (protocol version 1) support in the server for new | ||
19 | # installations. In future the default will change to require explicit | ||
20 | # activation of protocol 1 | ||
21 | Protocol 2 | ||
22 | |||
19 | # HostKey for protocol version 1 | 23 | # HostKey for protocol version 1 |
20 | #HostKey /etc/ssh/ssh_host_key | 24 | #HostKey /etc/ssh/ssh_host_key |
21 | # HostKeys for protocol version 2 | 25 | # HostKeys for protocol version 2 |