diff options
-rw-r--r-- | ssh-keygen.1 | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index b73c4606e..9b93666c9 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.124 2014/12/21 22:27:56 djm Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.125 2015/02/24 15:24:05 naddy 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: December 21 2014 $ | 38 | .Dd $Mdocdate: February 24 2015 $ |
39 | .Dt SSH-KEYGEN 1 | 39 | .Dt SSH-KEYGEN 1 |
40 | .Os | 40 | .Os |
41 | .Sh NAME | 41 | .Sh NAME |
@@ -73,6 +73,7 @@ | |||
73 | .Op Fl f Ar keyfile | 73 | .Op Fl f Ar keyfile |
74 | .Nm ssh-keygen | 74 | .Nm ssh-keygen |
75 | .Fl l | 75 | .Fl l |
76 | .Op Fl v | ||
76 | .Op Fl E Ar fingerprint_hash | 77 | .Op Fl E Ar fingerprint_hash |
77 | .Op Fl f Ar input_keyfile | 78 | .Op Fl f Ar input_keyfile |
78 | .Nm ssh-keygen | 79 | .Nm ssh-keygen |
diff --git a/ssh-keygen.c b/ssh-keygen.c index b85fa4964..4a5c40284 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.264 2015/02/23 22:21:21 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.265 2015/02/24 15:24:05 naddy Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -2204,7 +2204,7 @@ usage(void) | |||
2204 | " ssh-keygen -e [-m key_format] [-f input_keyfile]\n" | 2204 | " ssh-keygen -e [-m key_format] [-f input_keyfile]\n" |
2205 | " ssh-keygen -y [-f input_keyfile]\n" | 2205 | " ssh-keygen -y [-f input_keyfile]\n" |
2206 | " ssh-keygen -c [-P passphrase] [-C comment] [-f keyfile]\n" | 2206 | " ssh-keygen -c [-P passphrase] [-C comment] [-f keyfile]\n" |
2207 | " ssh-keygen -l [-E fingerprint_hash] [-f input_keyfile]\n" | 2207 | " ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" |
2208 | " ssh-keygen -B [-f input_keyfile]\n"); | 2208 | " ssh-keygen -B [-f input_keyfile]\n"); |
2209 | #ifdef ENABLE_PKCS11 | 2209 | #ifdef ENABLE_PKCS11 |
2210 | fprintf(stderr, | 2210 | fprintf(stderr, |