summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ssh-add.111
-rw-r--r--ssh.17
-rw-r--r--ssh_config.510
4 files changed, 27 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e1bb231b..0f062fa60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,10 @@
29 - jmc@cvs.openbsd.org 2010/03/05 08:31:20 29 - jmc@cvs.openbsd.org 2010/03/05 08:31:20
30 [ssh.1] 30 [ssh.1]
31 document certificate authentication; help/ok djm 31 document certificate authentication; help/ok djm
32 - djm@cvs.openbsd.org 2010/03/05 10:28:21
33 [ssh-add.1 ssh.1 ssh_config.5]
34 mention loading of certificate files from [private]-cert.pub when
35 they are present; feedback and ok jmc@
32 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older 36 - (tim) [ssh-pkcs11.c] Fix "non-constant initializer" errors in older
33 compilers. OK djm@ 37 compilers. OK djm@
34 - (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure 38 - (djm) [ssh-rand-helper.c] declare optind, avoiding compilation failure
diff --git a/ssh-add.1 b/ssh-add.1
index 0d5e39272..d7cc53101 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.51 2010/02/10 23:20:38 markus Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.52 2010/03/05 10:28:21 djm 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: February 10 2010 $ 40.Dd $Mdocdate: March 5 2010 $
41.Dt SSH-ADD 1 41.Dt SSH-ADD 1
42.Os 42.Os
43.Sh NAME 43.Sh NAME
@@ -61,7 +61,14 @@ When run without arguments, it adds the files
61.Pa ~/.ssh/id_dsa 61.Pa ~/.ssh/id_dsa
62and 62and
63.Pa ~/.ssh/identity . 63.Pa ~/.ssh/identity .
64After loading a private key,
65.Nm
66will try to load corresponding certificate information from the
67filename obtained by appending
68.Pa -cert.pub
69to the name of the private key file.
64Alternative file names can be given on the command line. 70Alternative file names can be given on the command line.
71.Pp
65If any file requires a passphrase, 72If any file requires a passphrase,
66.Nm 73.Nm
67asks for the passphrase from the user. 74asks for the passphrase from the user.
diff --git a/ssh.1 b/ssh.1
index c1a408348..3f815b8e7 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.\" $OpenBSD: ssh.1,v 1.301 2010/03/05 08:31:20 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.302 2010/03/05 10:28:21 djm Exp $
38.Dd $Mdocdate: March 5 2010 $ 38.Dd $Mdocdate: March 5 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -306,6 +306,11 @@ It is possible to have multiple
306.Fl i 306.Fl i
307options (and multiple identities specified in 307options (and multiple identities specified in
308configuration files). 308configuration files).
309.Nm
310will also try to load certificate information from the filename obtained
311by appending
312.Pa -cert.pub
313to identity filenames.
309.It Fl K 314.It Fl K
310Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI 315Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI
311credentials to the server. 316credentials to the server.
diff --git a/ssh_config.5 b/ssh_config.5
index 7ab5d02fd..8cf02597d 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.128 2010/02/10 23:20:38 markus Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.129 2010/03/05 10:28:21 djm Exp $
38.Dd $Mdocdate: February 10 2010 $ 38.Dd $Mdocdate: March 5 2010 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -559,6 +559,12 @@ and
559for protocol version 2. 559for protocol version 2.
560Additionally, any identities represented by the authentication agent 560Additionally, any identities represented by the authentication agent
561will be used for authentication. 561will be used for authentication.
562.Xr ssh 1
563will try to load certificate information from the filename obtained by
564appending
565.Pa -cert.pub
566to the path of a specified
567.Cm IdentityFile .
562.Pp 568.Pp
563The file name may use the tilde 569The file name may use the tilde
564syntax to refer to a user's home directory or one of the following 570syntax to refer to a user's home directory or one of the following