diff options
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index c2cfe8df0..ea3c0e638 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.337 2019/07/16 13:18:39 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.338 2019/07/19 03:38:01 djm 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 |
@@ -1172,7 +1172,7 @@ known_hosts_find_delete(struct hostkey_foreach_line *l, void *_ctx) | |||
1172 | struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx; | 1172 | struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx; |
1173 | enum sshkey_fp_rep rep; | 1173 | enum sshkey_fp_rep rep; |
1174 | int fptype; | 1174 | int fptype; |
1175 | char *fp; | 1175 | char *fp = NULL, *ra = NULL; |
1176 | 1176 | ||
1177 | fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash; | 1177 | fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash; |
1178 | rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; | 1178 | rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; |
@@ -1206,8 +1206,16 @@ known_hosts_find_delete(struct hostkey_foreach_line *l, void *_ctx) | |||
1206 | known_hosts_hash(l, ctx); | 1206 | known_hosts_hash(l, ctx); |
1207 | else if (print_fingerprint) { | 1207 | else if (print_fingerprint) { |
1208 | fp = sshkey_fingerprint(l->key, fptype, rep); | 1208 | fp = sshkey_fingerprint(l->key, fptype, rep); |
1209 | ra = sshkey_fingerprint(l->key, | ||
1210 | fingerprint_hash, SSH_FP_RANDOMART); | ||
1211 | if (fp == NULL || ra == NULL) | ||
1212 | fatal("%s: sshkey_fingerprint failed", | ||
1213 | __func__); | ||
1209 | mprintf("%s %s %s %s\n", ctx->host, | 1214 | mprintf("%s %s %s %s\n", ctx->host, |
1210 | sshkey_type(l->key), fp, l->comment); | 1215 | sshkey_type(l->key), fp, l->comment); |
1216 | if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) | ||
1217 | printf("%s\n", ra); | ||
1218 | free(ra); | ||
1211 | free(fp); | 1219 | free(fp); |
1212 | } else | 1220 | } else |
1213 | fprintf(ctx->out, "%s\n", l->line); | 1221 | fprintf(ctx->out, "%s\n", l->line); |