diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-11-13 04:34:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-11-16 11:31:36 +1100 |
commit | 94bc0b72c29e511cbbc5772190d43282e5acfdfe (patch) | |
tree | c602d4382625065f3ce997c81dbaf7613d92e81c /ssh-keygen.1 | |
parent | b6b9108f5b561c83612cb97ece4134eb59fde071 (diff) |
upstream commit
support multiple certificates (one per line) and
reading from standard input (using "-f -") for "ssh-keygen -L"; ok dtucker@
Upstream-ID: ecbadeeef3926e5be6281689b7250a32a80e88db
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r-- | ssh-keygen.1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index ffa946b38..74b3124f5 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.128 2015/11/05 09:48:05 jmc Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.129 2015/11/13 04:34:15 djm 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 |
@@ -35,7 +35,7 @@ | |||
35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 35 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 36 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
37 | .\" | 37 | .\" |
38 | .Dd $Mdocdate: November 5 2015 $ | 38 | .Dd $Mdocdate: November 13 2015 $ |
39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -376,7 +376,7 @@ using the format described in the | |||
376 | .Sx KEY REVOCATION LISTS | 376 | .Sx KEY REVOCATION LISTS |
377 | section. | 377 | section. |
378 | .It Fl L | 378 | .It Fl L |
379 | Prints the contents of a certificate. | 379 | Prints the contents of one or more certificates. |
380 | .It Fl l | 380 | .It Fl l |
381 | Show fingerprint of specified public key file. | 381 | Show fingerprint of specified public key file. |
382 | Private RSA1 keys are also supported. | 382 | Private RSA1 keys are also supported. |