Attachment #1767 for bug #1693

Lines 1231-1236 Link Here

(-)openssh-5.3p1/sshconnect2.c (+6 lines)
1231	debug3("no such identity: %s", filename);	1231	debug3("no such identity: %s", filename);
1232	return NULL;	1232	return NULL;
1233	}	1233	}
		1234
		1235	if (access(filename, R_OK) < 0) {
		1236	debug3("cannot read identity: %s", filename);
		1237	return NULL;
		1238	}
		1239
1234	private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok);	1240	private = key_load_private_type(KEY_UNSPEC, filename, "", NULL, &perm_ok);
1235	if (!perm_ok)	1241	if (!perm_ok)
1236	return NULL;	1242	return NULL;

Lines 953-958 Link Here

(-)openssh-5.3p1/ssh-keygen.c (+4 lines)
953	perror(identity_file);	953	perror(identity_file);
954	exit(1);	954	exit(1);
955	}	955	}
		956	if (access(identity_file, R_OK) < 0) {
		957	perror(identity_file);
		958	exit(1);
		959	}
956	private = key_load_private(identity_file, "", &comment);	960	private = key_load_private(identity_file, "", &comment);
957	if (private == NULL) {	961	if (private == NULL) {
958	if (identity_passphrase)	962	if (identity_passphrase)

Return to bug 1693