diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-30 10:38:26 +0000 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-30 10:38:26 +0000 |
commit | fc1725b12ffae83614d3792ec9a8fae764fa8213 (patch) | |
tree | 5b2963169a97ac6fc0a40498e9dd008ade9e6ca1 /system/openssh/CVE-2018-20685.patch | |
parent | ae3f7a857962a758a7783cb4d343760a9582478d (diff) | |
download | packages-fc1725b12ffae83614d3792ec9a8fae764fa8213.tar.gz packages-fc1725b12ffae83614d3792ec9a8fae764fa8213.tar.bz2 packages-fc1725b12ffae83614d3792ec9a8fae764fa8213.tar.xz packages-fc1725b12ffae83614d3792ec9a8fae764fa8213.zip |
system/openssh: Bump to 8.1p1, fixes for time64
Diffstat (limited to 'system/openssh/CVE-2018-20685.patch')
-rw-r--r-- | system/openssh/CVE-2018-20685.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/system/openssh/CVE-2018-20685.patch b/system/openssh/CVE-2018-20685.patch deleted file mode 100644 index f2f1ecfc5..000000000 --- a/system/openssh/CVE-2018-20685.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001 -From: "djm@openbsd.org" <djm@openbsd.org> -Date: Fri, 16 Nov 2018 03:03:10 +0000 -Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer - to the - -current directory; based on report/patch from Harry Sintonen - -OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 ---- - scp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/scp.c b/scp.c -index 60682c687..4f3fdcd3d 100644 ---- a/scp.c -+++ b/scp.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ -+/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ - /* - * scp - secure remote copy. This is basically patched BSD rcp which - * uses ssh to do the data transfer (instead of using rcmd). -@@ -1106,7 +1106,8 @@ sink(int argc, char **argv) - SCREWUP("size out of range"); - size = (off_t)ull; - -- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { -+ if (*cp == '\0' || strchr(cp, '/') != NULL || -+ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { - run_err("error: unexpected filename: %s", cp); - exit(1); - } |