summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-10-24 11:41:34 +1100
committerDarren Tucker <dtucker@zip.com.au>2009-10-24 11:41:34 +1100
commitae69e1d010ddf367fdd8ecf7f006c54cfe3f9728 (patch)
treeb6559ad36d2d9c4573cbf438c310a98b77dc3e0a
parent49b7e235455bf20227877624f8c60c34a6e78458 (diff)
- sobrado@cvs.openbsd.org 2009/10/22 12:35:53
[ssh.1 ssh-agent.1 ssh-add.1] use the UNIX-related macros (.At and .Ux) where appropriate. ok jmc@
-rw-r--r--ChangeLog4
-rw-r--r--ssh-add.19
-rw-r--r--ssh-agent.116
-rw-r--r--ssh.19
4 files changed, 24 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 67839e275..ef05cbe35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
6 - sobrado@cvs.openbsd.org 2009/10/17 12:10:39 6 - sobrado@cvs.openbsd.org 2009/10/17 12:10:39
7 [sftp-server.c] 7 [sftp-server.c]
8 sort flags. 8 sort flags.
9 - sobrado@cvs.openbsd.org 2009/10/22 12:35:53
10 [ssh.1 ssh-agent.1 ssh-add.1]
11 use the UNIX-related macros (.At and .Ux) where appropriate.
12 ok jmc@
9 13
1020091011 1420091011
11 - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for 15 - (dtucker) [configure.ac sftp-client.c] Remove the gyrations required for
diff --git a/ssh-add.1 b/ssh-add.1
index 005041b68..c484e94a0 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.46 2007/06/12 13:41:03 jmc Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.47 2009/10/22 12:35:53 sobrado Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -37,7 +37,7 @@
37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 37.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 38.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39.\" 39.\"
40.Dd $Mdocdate: June 12 2007 $ 40.Dd $Mdocdate: October 22 2009 $
41.Dt SSH-ADD 1 41.Dt SSH-ADD 1
42.Os 42.Os
43.Sh NAME 43.Sh NAME
@@ -148,8 +148,9 @@ may be necessary to redirect the input from
148.Pa /dev/null 148.Pa /dev/null
149to make this work.) 149to make this work.)
150.It Ev SSH_AUTH_SOCK 150.It Ev SSH_AUTH_SOCK
151Identifies the path of a unix-domain socket used to communicate with the 151Identifies the path of a
152agent. 152.Ux
153domain socket used to communicate with the agent.
153.El 154.El
154.Sh FILES 155.Sh FILES
155.Bl -tag -width Ds 156.Bl -tag -width Ds
diff --git a/ssh-agent.1 b/ssh-agent.1
index 533cd6f6b..bbae4af92 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.47 2009/03/26 08:38:39 sobrado Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.48 2009/10/22 12:35:53 sobrado Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.Dd $Mdocdate: March 26 2009 $ 37.Dd $Mdocdate: October 22 2009 $
38.Dt SSH-AGENT 1 38.Dt SSH-AGENT 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -67,7 +67,9 @@ machines using
67The options are as follows: 67The options are as follows:
68.Bl -tag -width Ds 68.Bl -tag -width Ds
69.It Fl a Ar bind_address 69.It Fl a Ar bind_address
70Bind the agent to the unix-domain socket 70Bind the agent to the
71.Ux
72domain socket
71.Ar bind_address . 73.Ar bind_address .
72The default is 74The default is
73.Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt . 75.Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt .
@@ -162,8 +164,9 @@ Instead, operations that require a private key will be performed
162by the agent, and the result will be returned to the requester. 164by the agent, and the result will be returned to the requester.
163This way, private keys are not exposed to clients using the agent. 165This way, private keys are not exposed to clients using the agent.
164.Pp 166.Pp
165A unix-domain socket is created 167A
166and the name of this socket is stored in the 168.Ux
169domain socket is created and the name of this socket is stored in the
167.Ev SSH_AUTH_SOCK 170.Ev SSH_AUTH_SOCK
168environment 171environment
169variable. 172variable.
@@ -186,7 +189,8 @@ Contains the protocol version 2 DSA authentication identity of the user.
186.It Pa ~/.ssh/id_rsa 189.It Pa ~/.ssh/id_rsa
187Contains the protocol version 2 RSA authentication identity of the user. 190Contains the protocol version 2 RSA authentication identity of the user.
188.It Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt 191.It Pa /tmp/ssh-XXXXXXXXXX/agent.\*(Ltppid\*(Gt
189Unix-domain sockets used to contain the connection to the 192.Ux
193domain sockets used to contain the connection to the
190authentication agent. 194authentication agent.
191These sockets should only be readable by the owner. 195These sockets should only be readable by the owner.
192The sockets should get automatically removed when the agent exits. 196The sockets should get automatically removed when the agent exits.
diff --git a/ssh.1 b/ssh.1
index 8c3d32aaf..9aca407a5 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.284 2009/10/08 20:42:12 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.285 2009/10/22 12:35:53 sobrado Exp $
38.Dd $Mdocdate: October 8 2009 $ 38.Dd $Mdocdate: October 22 2009 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -132,8 +132,9 @@ This can also be specified on a per-host basis in a configuration file.
132.Pp 132.Pp
133Agent forwarding should be enabled with caution. 133Agent forwarding should be enabled with caution.
134Users with the ability to bypass file permissions on the remote host 134Users with the ability to bypass file permissions on the remote host
135(for the agent's Unix-domain socket) 135(for the agent's
136can access the local agent through the forwarded connection. 136.Ux
137domain socket) can access the local agent through the forwarded connection.
137An attacker cannot obtain key material from the agent, 138An attacker cannot obtain key material from the agent,
138however they can perform operations on the keys that enable them to 139however they can perform operations on the keys that enable them to
139authenticate using the identities loaded into the agent. 140authenticate using the identities loaded into the agent.