tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: set interactive mode for ControlPersist sessions if they 

originally requested a tty; enables keystroke timing obfuscation for most
ControlPersist sessions. Spotted by naddy@

OpenBSD-Commit-ID: 72783a26254202e2f3f41a2818a19956fe49a772
This commit is contained in:
djm@openbsd.org 2023-09-03 23:59:32 +00:00 committed by Damien Miller
parent ff3eda68ce
commit 43254b326a
No known key found for this signature in database
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.593 2023/07/26 23:06:00 djm Exp $ */ /* $OpenBSD: ssh.c,v 1.594 2023/09/03 23:59:32 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2140,7 +2140,7 @@ ssh_session2_open(struct ssh *ssh)
static int static int
ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo) ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo)
{ {
int r, id = -1; int r, interactive, id = -1;
char *cp, *tun_fwd_ifname = NULL; char *cp, *tun_fwd_ifname = NULL;
/* XXX should be pre-session */ /* XXX should be pre-session */
@ -2197,8 +2197,11 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo)
if (options.session_type != SESSION_TYPE_NONE) if (options.session_type != SESSION_TYPE_NONE)
id = ssh_session2_open(ssh); id = ssh_session2_open(ssh);
else { else {
ssh_packet_set_interactive(ssh, interactive = options.control_master == SSHCTL_MASTER_NO;
options.control_master == SSHCTL_MASTER_NO, /* ControlPersist may have clobbered ControlMaster, so check */
if (need_controlpersist_detach)
interactive = otty_flag != 0;
ssh_packet_set_interactive(ssh, interactive,
options.ip_qos_interactive, options.ip_qos_bulk); options.ip_qos_interactive, options.ip_qos_bulk);
} }