summaryrefslogtreecommitdiff
path: root/ssh-keygen.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2022-05-09 03:09:53 +0000
committerDamien Miller <djm@mindrot.org>2022-05-09 13:11:03 +1000
commit0086a286ea6bbd11ca9b664ac3bb12b27443d6eb (patch)
tree6c7abf86c6194400cbfcaee4fc0f65ed9c988244 /ssh-keygen.1
parentcb010744cc98f651b1029bb09efa986eb54e4ccf (diff)
downloadopenssh-git-0086a286ea6bbd11ca9b664ac3bb12b27443d6eb.tar.gz
upstream: Allow existing -U (use agent) flag to work with "-Y sign"
operations, where it will be interpreted to require that the private keys is hosted in an agent; bz3429, suggested by Adam Szkoda; ok dtucker@ OpenBSD-Commit-ID: a7bc69873b99c32c42c7628ed9ea91565ba08c2f
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r--ssh-keygen.18
1 files changed, 5 insertions, 3 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 561600db..4e724536 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.221 2022/05/03 07:42:27 florian Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.222 2022/05/09 03:09:53 djm Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 3 2022 $
+.Dd $Mdocdate: May 9 2022 $
.Dt SSH-KEYGEN 1
.Os
.Sh NAME
@@ -583,7 +583,9 @@ and
(the default).
.It Fl U
When used in combination with
-.Fl s ,
+.Fl s
+or
+.Fl Y Ar sign ,
this option indicates that a CA key resides in a
.Xr ssh-agent 1 .
See the