Attachment 3289 Details for Bug 3003 – tweak for style(9)

[patch] tweak for style(9)

bz3003.diff (text/plain), 1.34 KB, created by Damien Miller on 2019-06-07 14:03:41 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2019-06-07 14:03:41 AEST

Size: 1.34 KB

patch

obsolete

>diff --git a/ssh-keygen.1 b/ssh-keygen.1
>index 12445657..47a48ab6 100644
>--- a/ssh-keygen.1
>+++ b/ssh-keygen.1
>@@ -87,6 +87,7 @@
> .Fl F Ar hostname
> .Op Fl f Ar known_hosts_file
> .Op Fl l
>+.Op Fl v
> .Nm ssh-keygen
> .Fl H
> .Op Fl f Ar known_hosts_file
>diff --git a/ssh-keygen.c b/ssh-keygen.c
>index 3898b281..29e453e3 100644
>--- a/ssh-keygen.c
>+++ b/ssh-keygen.c
>@@ -1174,7 +1174,7 @@ known_hosts_find_delete(struct hostkey_foreach_line *l, void *_ctx)
> 	struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx;
> 	enum sshkey_fp_rep rep;
> 	int fptype;
>-	char *fp;
>+	char *fp = NULL, *ra = NULL;
> 
> 	fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash;
> 	rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT;
>@@ -1208,8 +1208,16 @@ known_hosts_find_delete(struct hostkey_foreach_line *l, void *_ctx)
> 				known_hosts_hash(l, ctx);
> 			else if (print_fingerprint) {
> 				fp = sshkey_fingerprint(l->key, fptype, rep);
>+				ra = sshkey_fingerprint(l->key,
>+				    fingerprint_hash, SSH_FP_RANDOMART);
>+				if (fp == NULL || ra == NULL)
>+					fatal("%s: sshkey_fingerprint failed",
>+					    __func__);
> 				mprintf("%s %s %s %s\n", ctx->host,
> 				    sshkey_type(l->key), fp, l->comment);
>+				if (log_level_get() >= SYSLOG_LEVEL_VERBOSE)
>+					printf("%s\n", ra);
>+				free(ra);
> 				free(fp);
> 			} else
> 				fprintf(ctx->out, "%s\n", l->line);

Actions: View | Diff

Attachments on bug 3003: 3274 | 3275 | 3276 | 3289