Attachment 3276 Details for Bug 3003 – corrected patch for both ssh-keygen.c & man page

[patch] corrected patch for both ssh-keygen.c & man page

ssh-keygen_print_known_hosts_ascii_art.patch (text/plain), 1.31 KB, created by Ville Sinisalo on 2019-05-06 03:34:09 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Sinisalo

Created: 2019-05-06 03:34:09 AEST

Size: 1.31 KB

patch

obsolete

>diff -ru ssh/ssh-keygen.1 ssh-patched/ssh-keygen.1
>--- ssh/ssh-keygen.1	2019-05-05 02:10:14.251165227 +0300
>+++ ssh-patched/ssh-keygen.1	2019-05-05 02:09:41.471165176 +0300
>@@ -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 -ru ssh/ssh-keygen.c ssh-patched/ssh-keygen.c
>--- ssh/ssh-keygen.c	2019-05-05 01:19:30.917826766 +0300
>+++ ssh-patched/ssh-keygen.c	2019-05-05 20:29:09.161286315 +0300
>@@ -1153,7 +1153,7 @@
> 	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;
>@@ -1187,8 +1187,14 @@
> 				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