summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.19
-rw-r--r--ssh-keygen.c4
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 29671088f..299163363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
14 - markus@cvs.openbsd.org 2001/10/24 19:57:40 14 - markus@cvs.openbsd.org 2001/10/24 19:57:40
15 [clientloop.c] 15 [clientloop.c]
16 make ~& (backgrounding) work again for proto v1; add support ~& for v2, too 16 make ~& (backgrounding) work again for proto v1; add support ~& for v2, too
17 - markus@cvs.openbsd.org 2001/10/25 21:14:32
18 [ssh-keygen.1 ssh-keygen.c]
19 better docu for fingerprinting, ok deraadt@
17 20
1820011109 2120011109
19 - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) 22 - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
@@ -6823,4 +6826,4 @@
6823 - Wrote replacements for strlcpy and mkdtemp 6826 - Wrote replacements for strlcpy and mkdtemp
6824 - Released 1.0pre1 6827 - Released 1.0pre1
6825 6828
6826$Id: ChangeLog,v 1.1638 2001/11/11 23:52:25 djm Exp $ 6829$Id: ChangeLog,v 1.1639 2001/11/11 23:52:44 djm Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index e24566154..622cb5c99 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.49 2001/09/05 06:23:07 deraadt Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.50 2001/10/25 21:14:32 markus Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -147,6 +147,7 @@ above that no longer improve security but make things slower.
147The default is 1024 bits. 147The default is 1024 bits.
148.It Fl c 148.It Fl c
149Requests changing the comment in the private and public key files. 149Requests changing the comment in the private and public key files.
150This operation is only supported for RSA1 keys.
150The program will prompt for the file containing the private keys, for 151The program will prompt for the file containing the private keys, for
151the passphrase if the key has one, and for the new comment. 152the passphrase if the key has one, and for the new comment.
152.It Fl e 153.It Fl e
@@ -168,7 +169,11 @@ also reads the
168This option allows importing keys from several commercial 169This option allows importing keys from several commercial
169SSH implementations. 170SSH implementations.
170.It Fl l 171.It Fl l
171Show fingerprint of specified private or public key file. 172Show fingerprint of specified public key file.
173Private RSA1 keys are also supported.
174For RSA and DSA keys
175.Nm
176tries to find the matching public key file and prints its fingerprint.
172.It Fl p 177.It Fl p
173Requests changing the passphrase of a private key file instead of 178Requests changing the passphrase of a private key file instead of
174creating a new private key. 179creating a new private key.
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 727b876de..6d509972f 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.82 2001/09/28 12:07:09 djm Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.83 2001/10/25 21:14:32 markus Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>
@@ -615,7 +615,7 @@ do_fingerprint(struct passwd *pw)
615 fclose(f); 615 fclose(f);
616 } 616 }
617 if (invalid) { 617 if (invalid) {
618 printf("%s is not a valid key file.\n", identity_file); 618 printf("%s is not a public key file.\n", identity_file);
619 exit(1); 619 exit(1);
620 } 620 }
621 exit(0); 621 exit(0);