mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 15:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1724 from mischief/openssh-CVE-2016-0777

Browse Source 
net-misc/openssh: import upstream gentoo patch for CVE-2016-0777
This commit is contained in:
Nick Owens 2016-01-14 12:00:49 -08:00
commit 45257bcb80
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sdk_container/src/third_party/coreos-overlay/net-misc/openssh/files/openssh-7.1_p1-CVE-2016-0777.patch vendored Normal file
View File

@ -0,0 +1,34 @@
--- openssh-7.1p1/readconf.c
+++ openssh-7.1p1/readconf.c
@@ -1660,7 +1660,7 @@
options->tun_remote = -1;
options->local_command = NULL;
options->permit_local_command = -1;
- options->use_roaming = -1;
+ options->use_roaming = 0;
options->visual_host_key = -1;
options->ip_qos_interactive = -1;
options->ip_qos_bulk = -1;
@@ -1833,8 +1833,7 @@
options->tun_remote = SSH_TUNID_ANY;
if (options->permit_local_command == -1)
options->permit_local_command = 0;
- if (options->use_roaming == -1)
- options->use_roaming = 1;
+ options->use_roaming = 0;
if (options->visual_host_key == -1)
options->visual_host_key = 0;
if (options->ip_qos_interactive == -1)
--- openssh-7.1p1/ssh.c
+++ openssh-7.1p1/ssh.c
@@ -1932,9 +1932,6 @@
fork_postauth();
}
- if (options.use_roaming)
- request_roaming();
-
return client_loop(tty_flag, tty_flag ?
options.escape_char : SSH_ESCAPECHAR_NONE, id);
}

2
sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-7.1_p1-r3.ebuild → sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-7.1_p1-r4.ebuild vendored
View File

@ -142,6 +142,8 @@ src_prepare() {
save_version HPN save_version HPN
fi fi
epatch "${FILESDIR}"/${PN}-7.1_p1-CVE-2016-0777.patch
tc-export PKG_CONFIG tc-export PKG_CONFIG
local sed_args=( local sed_args=(
-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"