Attachment #1651 for bug #1611

View | Details | Raw Unified | Return to bug 1611
Collapse All | Expand All




	public = key_load_public(identity_file, &comment);
	if (public != NULL) {
		fp = key_fingerprint(public, fptype, rep);
		ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
		printf("%u %s %s (%s)\n", key_size(public), fp, comment,
		    key_type(public));
		if (log_level >= SYSLOG_LEVEL_VERBOSE)

			}
			comment = *cp ? cp : comment;
			fp = key_fingerprint(public, fptype, rep);
			ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
			printf("%u %s %s (%s)\n", key_size(public), fp,
			    comment ? comment : "no comment", key_type(public));
			if (log_level >= SYSLOG_LEVEL_VERBOSE)

		fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
		rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
		fp = key_fingerprint(public, fptype, rep);
		ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
		printf("%u %s %s (%s)\n", key_size(public), fp, name,
		    key_type(public));
		if (log_level >= SYSLOG_LEVEL_VERBOSE)

Return to bug 1611

Lines 524-530 Link Here

(-)ssh-keygen.c~ (-3 / +3 lines)
524	public = key_load_public(identity_file, &comment);	524	public = key_load_public(identity_file, &comment);
525	if (public != NULL) {	525	if (public != NULL) {
526	fp = key_fingerprint(public, fptype, rep);	526	fp = key_fingerprint(public, fptype, rep);
527	ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);	527	ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
528	printf("%u %s %s (%s)\n", key_size(public), fp, comment,	528	printf("%u %s %s (%s)\n", key_size(public), fp, comment,
529	key_type(public));	529	key_type(public));
530	if (log_level >= SYSLOG_LEVEL_VERBOSE)	530	if (log_level >= SYSLOG_LEVEL_VERBOSE)
Lines 589-595 Link Here
589	}	589	}
590	comment = *cp ? cp : comment;	590	comment = *cp ? cp : comment;
591	fp = key_fingerprint(public, fptype, rep);	591	fp = key_fingerprint(public, fptype, rep);
592	ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);	592	ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
593	printf("%u %s %s (%s)\n", key_size(public), fp,	593	printf("%u %s %s (%s)\n", key_size(public), fp,
594	comment ? comment : "no comment", key_type(public));	594	comment ? comment : "no comment", key_type(public));
595	if (log_level >= SYSLOG_LEVEL_VERBOSE)	595	if (log_level >= SYSLOG_LEVEL_VERBOSE)
Lines 619-625 Link Here
619	fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;	619	fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
620	rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;	620	rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
621	fp = key_fingerprint(public, fptype, rep);	621	fp = key_fingerprint(public, fptype, rep);
622	ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);	622	ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
623	printf("%u %s %s (%s)\n", key_size(public), fp, name,	623	printf("%u %s %s (%s)\n", key_size(public), fp, name,
624	key_type(public));	624	key_type(public));
625	if (log_level >= SYSLOG_LEVEL_VERBOSE)	625	if (log_level >= SYSLOG_LEVEL_VERBOSE)