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

Collapse All | Expand All

(-)ssh-keygen.c (-3 / +7 lines)
Lines 173-178 do_convert_to_ssh2(struct passwd *pw) Link Here
173
	Key *k;
173
	Key *k;
174
	u_int len;
174
	u_int len;
175
	u_char *blob;
175
	u_char *blob;
176
	char comment[61];
176
	struct stat st;
177
	struct stat st;
177
178
178
	if (!have_identity)
179
	if (!have_identity)
Lines 195-205 do_convert_to_ssh2(struct passwd *pw) Link Here
195
		fprintf(stderr, "key_to_blob failed\n");
196
		fprintf(stderr, "key_to_blob failed\n");
196
		exit(1);
197
		exit(1);
197
	}
198
	}
198
	fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN);
199
	/* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */
199
	fprintf(stdout,
200
	snprintf(comment, sizeof(comment),
200
	    "Comment: \"%u-bit %s, converted from OpenSSH by %s@%s\"\n",
201
	    "%u-bit %s, converted by %s@%s from OpenSSH",
201
	    key_size(k), key_type(k),
202
	    key_size(k), key_type(k),
202
	    pw->pw_name, hostname);
203
	    pw->pw_name, hostname);
204
205
	fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN);
206
	fprintf(stdout, "Comment: \"%s\"\n", comment);
203
	dump_base64(stdout, blob, len);
207
	dump_base64(stdout, blob, len);
204
	fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END);
208
	fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END);
205
	key_free(k);
209
	key_free(k);

Return to bug 1630