View | Details | Raw Unified | Return to bug 2247 | Differences between
and this patch

Collapse All | Expand All

(-)a/key.c (-5 / +9 lines)
Lines 547-559 key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len, const Key *k) Link Here
547
	 * intersects with itself.  Matter of taste.
547
	 * intersects with itself.  Matter of taste.
548
	 */
548
	 */
549
	char	*augmentation_string = " .o+=*BOX@%&#/^SE";
549
	char	*augmentation_string = " .o+=*BOX@%&#/^SE";
550
	char	*retval, *p;
550
	char	*retval, *p, key_details[FLDSIZE_X + 1];
551
	u_char	 field[FLDSIZE_X][FLDSIZE_Y];
551
	u_char	 field[FLDSIZE_X][FLDSIZE_Y];
552
	u_int	 i, b;
552
	u_int	 i, b;
553
	int	 x, y;
553
	int	 x, y;
554
	size_t	 len = strlen(augmentation_string) - 1;
554
	size_t	 len = strlen(augmentation_string) - 1;
555
555
556
	retval = xcalloc(1, (FLDSIZE_X + 3) * (FLDSIZE_Y + 2));
556
	retval = xcalloc(1, (FLDSIZE_X + 3) * (FLDSIZE_Y + 2));
557
	p = retval;
557
558
558
	/* initialize field */
559
	/* initialize field */
559
	memset(field, 0, FLDSIZE_X * FLDSIZE_Y * sizeof(char));
560
	memset(field, 0, FLDSIZE_X * FLDSIZE_Y * sizeof(char));
Lines 587-597 key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len, const Key *k) Link Here
587
	field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len - 1;
588
	field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len - 1;
588
	field[x][y] = len;
589
	field[x][y] = len;
589
590
590
	/* fill in retval */
591
	/* assemble key detail string */
591
	snprintf(retval, FLDSIZE_X, "+--[%4s %4u]", key_type(k), key_size(k));
592
	snprintf(key_details, FLDSIZE_X, "[%s %u]", key_type(k), key_size(k));
592
	p = strchr(retval, '\0');
593
593
594
	/* output upper border */
594
	/* output upper border */
595
	*p++ = '+';
596
	for (i = 0; i < (FLDSIZE_X - strlen(key_details)) / 2; i++)
597
		*p++ = '-';
598
	for (i = 0; key_details[i] != 0; i++)
599
		*p++ = key_details[i];
595
	for (i = p - retval - 1; i < FLDSIZE_X; i++)
600
	for (i = p - retval - 1; i < FLDSIZE_X; i++)
596
		*p++ = '-';
601
		*p++ = '-';
597
	*p++ = '+';
602
	*p++ = '+';
598
- 

Return to bug 2247