summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh.16
-rw-r--r--sshd.88
3 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 47b1c1652..25c46c1cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,10 @@
34 - dtucker@cvs.openbsd.org 2012/06/18 11:49:58 34 - dtucker@cvs.openbsd.org 2012/06/18 11:49:58
35 [ssh_config.5] 35 [ssh_config.5]
36 RSA instead of DSA twice. From Steve.McClellan at radisys com 36 RSA instead of DSA twice. From Steve.McClellan at radisys com
37 - dtucker@cvs.openbsd.org 2012/06/18 12:07:07
38 [ssh.1 sshd.8]
39 Remove mention of 'three' key files since there are now four. From
40 Steve.McClellan at radisys com.
37 41
3820120519 4220120519
39 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch 43 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch
diff --git a/ssh.1 b/ssh.1
index 207834039..71beefc15 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.324 2012/04/20 16:26:22 jmc Exp $ 36.\" $OpenBSD: ssh.1,v 1.325 2012/06/18 12:07:07 dtucker Exp $
37.Dd $Mdocdate: April 20 2012 $ 37.Dd $Mdocdate: June 18 2012 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -1375,7 +1375,7 @@ The file format and configuration options are described in
1375.It Pa /etc/ssh/ssh_host_dsa_key 1375.It Pa /etc/ssh/ssh_host_dsa_key
1376.It Pa /etc/ssh/ssh_host_ecdsa_key 1376.It Pa /etc/ssh/ssh_host_ecdsa_key
1377.It Pa /etc/ssh/ssh_host_rsa_key 1377.It Pa /etc/ssh/ssh_host_rsa_key
1378These three files contain the private parts of the host keys 1378These files contain the private parts of the host keys
1379and are used for host-based authentication. 1379and are used for host-based authentication.
1380If protocol version 1 is used, 1380If protocol version 1 is used,
1381.Nm 1381.Nm
diff --git a/sshd.8 b/sshd.8
index 6d79c7dda..a1a74d86a 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd.8,v 1.265 2012/05/13 01:42:32 dtucker Exp $ 36.\" $OpenBSD: sshd.8,v 1.266 2012/06/18 12:07:07 dtucker Exp $
37.Dd $Mdocdate: May 13 2012 $ 37.Dd $Mdocdate: June 18 2012 $
38.Dt SSHD 8 38.Dt SSHD 8
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -886,7 +886,7 @@ rlogin/rsh.
886.It Pa /etc/ssh/ssh_host_dsa_key 886.It Pa /etc/ssh/ssh_host_dsa_key
887.It Pa /etc/ssh/ssh_host_ecdsa_key 887.It Pa /etc/ssh/ssh_host_ecdsa_key
888.It Pa /etc/ssh/ssh_host_rsa_key 888.It Pa /etc/ssh/ssh_host_rsa_key
889These three files contain the private parts of the host keys. 889These files contain the private parts of the host keys.
890These files should only be owned by root, readable only by root, and not 890These files should only be owned by root, readable only by root, and not
891accessible to others. 891accessible to others.
892Note that 892Note that
@@ -897,7 +897,7 @@ does not start if these files are group/world-accessible.
897.It Pa /etc/ssh/ssh_host_dsa_key.pub 897.It Pa /etc/ssh/ssh_host_dsa_key.pub
898.It Pa /etc/ssh/ssh_host_ecdsa_key.pub 898.It Pa /etc/ssh/ssh_host_ecdsa_key.pub
899.It Pa /etc/ssh/ssh_host_rsa_key.pub 899.It Pa /etc/ssh/ssh_host_rsa_key.pub
900These three files contain the public parts of the host keys. 900These files contain the public parts of the host keys.
901These files should be world-readable but writable only by 901These files should be world-readable but writable only by
902root. 902root.
903Their contents should match the respective private parts. 903Their contents should match the respective private parts.