[openssh-commits] [openssh] 02/02: upstream: mention that the helpers are used by ssh(1), ssh-agent(1)

git+noreply at mindrot.org git+noreply at mindrot.org
Fri Apr 29 13:26:30 AEST 2022


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit af59463553b5ad52d3b42c4455ee3c5600158bb7
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Fri Apr 29 03:24:30 2022 +0000

    upstream: mention that the helpers are used by ssh(1), ssh-agent(1)
    
    and ssh-keygen(1). Previously only ssh(1) was mentioned. From Pedro
    Martelletto
    
    OpenBSD-Commit-ID: 30f880f989d4b329589c1c404315685960a5f153
---
 ssh-pkcs11-helper.8 | 23 ++++++++++++++---------
 ssh-sk-helper.8     | 23 ++++++++++++++---------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/ssh-pkcs11-helper.8 b/ssh-pkcs11-helper.8
index 6a592b1f..5edc9850 100644
--- a/ssh-pkcs11-helper.8
+++ b/ssh-pkcs11-helper.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-pkcs11-helper.8,v 1.6 2019/11/30 07:07:59 jmc Exp $
+.\" $OpenBSD: ssh-pkcs11-helper.8,v 1.7 2022/04/29 03:24:30 djm Exp $
 .\"
 .\" Copyright (c) 2010 Markus Friedl.  All rights reserved.
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 30 2019 $
+.Dd $Mdocdate: April 29 2022 $
 .Dt SSH-PKCS11-HELPER 8
 .Os
 .Sh NAME
@@ -26,12 +26,14 @@
 .Sh DESCRIPTION
 .Nm
 is used by
-.Xr ssh-agent 1
+.Xr ssh 1 ,
+.Xr ssh-agent 1 ,
+and
+.Xr ssh-keygen 1
 to access keys provided by a PKCS#11 token.
 .Pp
 .Nm
-is not intended to be invoked by the user, but from
-.Xr ssh-agent 1 .
+is not intended to be invoked directly by the user.
 .Pp
 A single option is supported:
 .Bl -tag -width Ds
@@ -47,17 +49,20 @@ options increase the verbosity.
 The maximum is 3.
 .Pp
 Note that
-.Xr ssh-agent 1
+.Xr ssh 1 ,
+.Xr ssh-agent 1 ,
+and
+.Xr ssh-keygen 1
 will automatically pass the
 .Fl v
 flag to
 .Nm
-when it has itself been placed in debug mode.
+when they have themselves been placed in debug mode.
 .El
 .Sh SEE ALSO
 .Xr ssh 1 ,
-.Xr ssh-add 1 ,
-.Xr ssh-agent 1
+.Xr ssh-agent 1 ,
+.Xr ssh-keygen 1
 .Sh HISTORY
 .Nm
 first appeared in
diff --git a/ssh-sk-helper.8 b/ssh-sk-helper.8
index 3c53da1e..e9b2ae12 100644
--- a/ssh-sk-helper.8
+++ b/ssh-sk-helper.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-sk-helper.8,v 1.3 2019/12/21 20:22:34 naddy Exp $
+.\" $OpenBSD: ssh-sk-helper.8,v 1.4 2022/04/29 03:24:30 djm Exp $
 .\"
 .\" Copyright (c) 2010 Markus Friedl.  All rights reserved.
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 21 2019 $
+.Dd $Mdocdate: April 29 2022 $
 .Dt SSH-SK-HELPER 8
 .Os
 .Sh NAME
@@ -26,12 +26,14 @@
 .Sh DESCRIPTION
 .Nm
 is used by
-.Xr ssh-agent 1
+.Xr ssh 1 ,
+.Xr ssh-agent 1 ,
+and
+.Xr ssh-keygen 1
 to access keys provided by a FIDO authenticator.
 .Pp
 .Nm
-is not intended to be invoked by the user, but from
-.Xr ssh-agent 1 .
+is not intended to be invoked directly by the user.
 .Pp
 A single option is supported:
 .Bl -tag -width Ds
@@ -47,17 +49,20 @@ options increase the verbosity.
 The maximum is 3.
 .Pp
 Note that
-.Xr ssh-agent 1
+.Xr ssh 1 ,
+.Xr ssh-agent 1 ,
+and
+.Xr ssh-keygen 1
 will automatically pass the
 .Fl v
 flag to
 .Nm
-when it has itself been placed in debug mode.
+when they have themselves been placed in debug mode.
 .El
 .Sh SEE ALSO
 .Xr ssh 1 ,
-.Xr ssh-add 1 ,
-.Xr ssh-agent 1
+.Xr ssh-agent 1 ,
+.Xr ssh-keygen 1
 .Sh HISTORY
 .Nm
 first appeared in

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list