- markus@cvs.openbsd.org 2001/10/25 21:14:32
[ssh-keygen.1 ssh-keygen.c] better docu for fingerprinting, ok deraadt@
This commit is contained in:
parent
96507ef535
commit
eb5fec6494
|
@ -14,6 +14,9 @@
|
||||||
- markus@cvs.openbsd.org 2001/10/24 19:57:40
|
- markus@cvs.openbsd.org 2001/10/24 19:57:40
|
||||||
[clientloop.c]
|
[clientloop.c]
|
||||||
make ~& (backgrounding) work again for proto v1; add support ~& for v2, too
|
make ~& (backgrounding) work again for proto v1; add support ~& for v2, too
|
||||||
|
- markus@cvs.openbsd.org 2001/10/25 21:14:32
|
||||||
|
[ssh-keygen.1 ssh-keygen.c]
|
||||||
|
better docu for fingerprinting, ok deraadt@
|
||||||
|
|
||||||
20011109
|
20011109
|
||||||
- (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
|
- (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
|
||||||
|
@ -6823,4 +6826,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1638 2001/11/11 23:52:25 djm Exp $
|
$Id: ChangeLog,v 1.1639 2001/11/11 23:52:44 djm Exp $
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
.\" $OpenBSD: ssh-keygen.1,v 1.49 2001/09/05 06:23:07 deraadt Exp $
|
.\" $OpenBSD: ssh-keygen.1,v 1.50 2001/10/25 21:14:32 markus Exp $
|
||||||
.\"
|
.\"
|
||||||
.\" -*- nroff -*-
|
.\" -*- nroff -*-
|
||||||
.\"
|
.\"
|
||||||
|
@ -147,6 +147,7 @@ above that no longer improve security but make things slower.
|
||||||
The default is 1024 bits.
|
The default is 1024 bits.
|
||||||
.It Fl c
|
.It Fl c
|
||||||
Requests changing the comment in the private and public key files.
|
Requests changing the comment in the private and public key files.
|
||||||
|
This operation is only supported for RSA1 keys.
|
||||||
The program will prompt for the file containing the private keys, for
|
The program will prompt for the file containing the private keys, for
|
||||||
the passphrase if the key has one, and for the new comment.
|
the passphrase if the key has one, and for the new comment.
|
||||||
.It Fl e
|
.It Fl e
|
||||||
|
@ -168,7 +169,11 @@ also reads the
|
||||||
This option allows importing keys from several commercial
|
This option allows importing keys from several commercial
|
||||||
SSH implementations.
|
SSH implementations.
|
||||||
.It Fl l
|
.It Fl l
|
||||||
Show fingerprint of specified private or public key file.
|
Show fingerprint of specified public key file.
|
||||||
|
Private RSA1 keys are also supported.
|
||||||
|
For RSA and DSA keys
|
||||||
|
.Nm
|
||||||
|
tries to find the matching public key file and prints its fingerprint.
|
||||||
.It Fl p
|
.It Fl p
|
||||||
Requests changing the passphrase of a private key file instead of
|
Requests changing the passphrase of a private key file instead of
|
||||||
creating a new private key.
|
creating a new private key.
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: ssh-keygen.c,v 1.82 2001/09/28 12:07:09 djm Exp $");
|
RCSID("$OpenBSD: ssh-keygen.c,v 1.83 2001/10/25 21:14:32 markus Exp $");
|
||||||
|
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include <openssl/pem.h>
|
#include <openssl/pem.h>
|
||||||
|
@ -615,7 +615,7 @@ do_fingerprint(struct passwd *pw)
|
||||||
fclose(f);
|
fclose(f);
|
||||||
}
|
}
|
||||||
if (invalid) {
|
if (invalid) {
|
||||||
printf("%s is not a valid key file.\n", identity_file);
|
printf("%s is not a public key file.\n", identity_file);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
exit(0);
|
exit(0);
|
||||||
|
|
Loading…
Reference in New Issue