summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh-keygen.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-03-12 22:02:03 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-03-12 22:02:03 +0000
commita7e1eed1c53b6b405afe9f21111727c1954e7265 (patch)
treead780c7bcf37571e8e047e210b6a86f1da432a0f /usr.bin/ssh/ssh-keygen.c
parentba3c6f715f22cd6f898396242be2f7b491887f29 (diff)
remove old key_fingerprint interface, s/_ex//
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
-rw-r--r--usr.bin/ssh/ssh-keygen.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 80bcb0e1940..4f6dae2088e 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.49 2001/03/11 22:33:24 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.50 2001/03/12 22:02:02 markus Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
@@ -349,7 +349,7 @@ do_fingerprint(struct passwd *pw)
debug("try_load_public_key KEY_UNSPEC failed");
}
if (success) {
- fp = key_fingerprint_ex(public, type, rep);
+ fp = key_fingerprint(public, type, rep);
printf("%d %s %s\n", key_size(public),
fp, comment);
key_free(public);
@@ -405,7 +405,7 @@ do_fingerprint(struct passwd *pw)
}
}
comment = *cp ? cp : comment;
- fp = key_fingerprint_ex(public, type, rep);
+ fp = key_fingerprint(public, type, rep);
printf("%d %s %s\n", key_size(public), fp,
comment ? comment : "no comment");
xfree(fp);
@@ -850,10 +850,12 @@ passphrase_again:
fclose(f);
if (!quiet) {
+ char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX);
printf("Your public key has been saved in %s.\n",
identity_file);
printf("The key fingerprint is:\n");
- printf("%s %s\n", key_fingerprint(public), comment);
+ printf("%s %s\n", fp, comment);
+ xfree(fp);
}
key_free(public);