diff options
author | djm@openbsd.org <djm@openbsd.org> | 2014-12-21 22:27:55 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-12-22 09:32:29 +1100 |
commit | 56d1c83cdd1ac76f1c6bd41e01e80dad834f3994 (patch) | |
tree | 700a872e702c686c1815bb1049eb93e88079b598 /ssh-keygen.1 | |
parent | 058f839fe15c51be8b3a844a76ab9a8db550be4f (diff) |
upstream commit
Add FingerprintHash option to control algorithm used for
key fingerprints. Default changes from MD5 to SHA256 and format from hex to
base64.
Feedback and ok naddy@ markus@
Diffstat (limited to 'ssh-keygen.1')
-rw-r--r-- | ssh-keygen.1 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1 index bf5f87bd3..b73c4606e 100644 --- a/ssh-keygen.1 +++ b/ssh-keygen.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-keygen.1,v 1.123 2014/08/30 15:33:50 sobrado Exp $ | 1 | .\" $OpenBSD: ssh-keygen.1,v 1.124 2014/12/21 22:27:56 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: August 30 2014 $ | 38 | .Dd $Mdocdate: December 21 2014 $ |
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 E Ar fingerprint_hash | ||
76 | .Op Fl f Ar input_keyfile | 77 | .Op Fl f Ar input_keyfile |
77 | .Nm ssh-keygen | 78 | .Nm ssh-keygen |
78 | .Fl B | 79 | .Fl B |
@@ -269,6 +270,14 @@ When used in combination with | |||
269 | this option indicates that a CA key resides in a PKCS#11 token (see the | 270 | this option indicates that a CA key resides in a PKCS#11 token (see the |
270 | .Sx CERTIFICATES | 271 | .Sx CERTIFICATES |
271 | section for details). | 272 | section for details). |
273 | .It Fl E Ar fingerprint_hash | ||
274 | Specifies the hash algorithm used when displaying key fingerprints. | ||
275 | Valid options are: | ||
276 | .Dq md5 | ||
277 | and | ||
278 | .Dq sha256 . | ||
279 | The default is | ||
280 | .Dq sha256 . | ||
272 | .It Fl e | 281 | .It Fl e |
273 | This option will read a private or public OpenSSH key file and | 282 | This option will read a private or public OpenSSH key file and |
274 | print to stdout the key in one of the formats specified by the | 283 | print to stdout the key in one of the formats specified by the |