summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2019-02-04 04:36:41 +0000
committermrg <mrg@NetBSD.org>2019-02-04 04:36:41 +0000
commit68d6437c47f4abba28cd5e3635ce619bb43187c3 (patch)
treeda220f2c9513babf3e25e6838a6573ad19ce3b28 /crypto
parent1d2aedfaad93d21f3805445f140655c974a67335 (diff)
- bump buffer sizes to avoid potential truncation issues
Diffstat (limited to 'crypto')
-rw-r--r--crypto/external/bsd/openssh/dist/fmt_scaled.h4
-rw-r--r--crypto/external/bsd/openssh/dist/scp.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/crypto/external/bsd/openssh/dist/fmt_scaled.h b/crypto/external/bsd/openssh/dist/fmt_scaled.h
index 309f1b549c2..abc742ab78b 100644
--- a/crypto/external/bsd/openssh/dist/fmt_scaled.h
+++ b/crypto/external/bsd/openssh/dist/fmt_scaled.h
@@ -1,6 +1,6 @@
-/* $NetBSD: fmt_scaled.h,v 1.7 2017/04/18 18:41:46 christos Exp $ */
+/* $NetBSD: fmt_scaled.h,v 1.8 2019/02/04 04:36:41 mrg Exp $ */
#ifndef FMT_SCALED_STRSIZE
-#define FMT_SCALED_STRSIZE 7
+#define FMT_SCALED_STRSIZE 40
#endif
int fmt_scaled(long long, char *);
int scan_scaled(const char *, long long *);
diff --git a/crypto/external/bsd/openssh/dist/scp.c b/crypto/external/bsd/openssh/dist/scp.c
index cb55c8676e0..651a0895fd1 100644
--- a/crypto/external/bsd/openssh/dist/scp.c
+++ b/crypto/external/bsd/openssh/dist/scp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scp.c,v 1.21 2019/01/27 02:08:33 pgoyette Exp $ */
+/* $NetBSD: scp.c,v 1.22 2019/02/04 04:36:41 mrg Exp $ */
/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */
/*
@@ -74,7 +74,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: scp.c,v 1.21 2019/01/27 02:08:33 pgoyette Exp $");
+__RCSID("$NetBSD: scp.c,v 1.22 2019/02/04 04:36:41 mrg Exp $");
#include <sys/param.h> /* roundup MAX */
#include <sys/types.h>
@@ -911,7 +911,7 @@ rsource(char *name, struct stat *statp)
{
DIR *dirp;
struct dirent *dp;
- char *last, *vect[1], path[PATH_MAX];
+ char *last, *vect[1], path[PATH_MAX + 20];
if (!(dirp = opendir(name))) {
run_err("%s: %s", name, strerror(errno));