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

Collapse All | Expand All

(-)a/sshkey.c (-6 / +11 lines)
Lines 1024-1030 fingerprint_randomart(u_char *dgst_raw, size_t dgst_raw_len, Link Here
1024
	 * intersects with itself.  Matter of taste.
1024
	 * intersects with itself.  Matter of taste.
1025
	 */
1025
	 */
1026
	char	*augmentation_string = " .o+=*BOX@%&#/^SE";
1026
	char	*augmentation_string = " .o+=*BOX@%&#/^SE";
1027
	char	*retval, *p;
1027
	char	*retval, *p, key_details[FLDSIZE_X + 1];
1028
	u_char	 field[FLDSIZE_X][FLDSIZE_Y];
1028
	u_char	 field[FLDSIZE_X][FLDSIZE_Y];
1029
	size_t	 i;
1029
	size_t	 i;
1030
	u_int	 b;
1030
	u_int	 b;
Lines 1034-1039 fingerprint_randomart(u_char *dgst_raw, size_t dgst_raw_len, Link Here
1034
	if ((retval = calloc((FLDSIZE_X + 3), (FLDSIZE_Y + 2))) == NULL)
1034
	if ((retval = calloc((FLDSIZE_X + 3), (FLDSIZE_Y + 2))) == NULL)
1035
		return NULL;
1035
		return NULL;
1036
1036
1037
	p = retval;
1038
1037
	/* initialize field */
1039
	/* initialize field */
1038
	memset(field, 0, FLDSIZE_X * FLDSIZE_Y * sizeof(char));
1040
	memset(field, 0, FLDSIZE_X * FLDSIZE_Y * sizeof(char));
1039
	x = FLDSIZE_X / 2;
1041
	x = FLDSIZE_X / 2;
Lines 1066-1077 fingerprint_randomart(u_char *dgst_raw, size_t dgst_raw_len, Link Here
1066
	field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len - 1;
1068
	field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len - 1;
1067
	field[x][y] = len;
1069
	field[x][y] = len;
1068
1070
1069
	/* fill in retval */
1071
	/* assemble key detail string */
1070
	snprintf(retval, FLDSIZE_X, "+--[%4s %4u]",
1072
	snprintf(key_details, FLDSIZE_X, "[%s %u]",
1071
	    sshkey_type(k), sshkey_size(k));
1073
		sshkey_type(k), sshkey_size(k));
1072
	p = strchr(retval, '\0');
1073
1074
1074
	/* output upper border */
1075
	/* output upper border */
1076
	*p++ = '+';
1077
	for (i = 0; i < (FLDSIZE_X - strlen(key_details)) / 2; i++)
1078
		*p++ = '-';
1079
	for (i = 0; key_details[i] != 0; i++)
1080
		*p++ = key_details[i];
1075
	for (i = p - retval - 1; i < FLDSIZE_X; i++)
1081
	for (i = p - retval - 1; i < FLDSIZE_X; i++)
1076
		*p++ = '-';
1082
		*p++ = '-';
1077
	*p++ = '+';
1083
	*p++ = '+';
1078
- 

Return to bug 2247