aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include/os.h
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2017-03-03 22:46:33 +0100
committerUlrich Sibiller <uli42@gmx.de>2017-03-03 22:53:20 +0100
commit65c5d8ad7a46a83338c23dee66e208a014c3d3d2 (patch)
tree85c18b5b866c0617f13ef2a1e06dac91cdcf508d /nx-X11/programs/Xserver/include/os.h
parent05aabb4e6f45bcb2c951ec04026f9d7bce7335b3 (diff)
downloadnx-libs-65c5d8ad7a46a83338c23dee66e208a014c3d3d2.tar.gz
nx-libs-65c5d8ad7a46a83338c23dee66e208a014c3d3d2.tar.bz2
nx-libs-65c5d8ad7a46a83338c23dee66e208a014c3d3d2.zip
Backport CVE-2017-2624 (timingsafe_memcmp)
Fixes ArcticaProject/nx-libs#365 These two commits: commit 5c44169caed811e59a65ba346de1cadb46d266ec Author: Adam Jackson <ajax@redhat.com> Date: Thu Mar 2 17:20:30 2017 -0500 os: Squash missing declaration warning for timingsafe_memcmp timingsafe_memcmp.c:21:1: warning: no previous prototype for ‘timingsafe_memcmp’ [-Wmissing-prototypes] timingsafe_memcmp(const void *b1, const void *b2, size_t len) Signed-off-by: Adam Jackson <ajax@redhat.com> commit d7ac755f0b618eb1259d93c8a16ec6e39a18627c Author: Matthieu Herrb <matthieu@herrb.eu> Date: Tue Feb 28 19:18:25 2017 +0100 Use timingsafe_memcmp() to compare MIT-MAGIC-COOKIES CVE-2017-2624 Provide the function definition for systems that don't have it. Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Diffstat (limited to 'nx-X11/programs/Xserver/include/os.h')
-rw-r--r--nx-X11/programs/Xserver/include/os.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/include/os.h b/nx-X11/programs/Xserver/include/os.h
index 59ace8fd2..0fd687d18 100644
--- a/nx-X11/programs/Xserver/include/os.h
+++ b/nx-X11/programs/Xserver/include/os.h
@@ -460,6 +460,11 @@ extern _X_EXPORT size_t
strlcat(char *dst, const char *src, size_t siz);
#endif
+#ifndef HAVE_TIMINGSAFE_MEMCMP
+extern _X_EXPORT int
+timingsafe_memcmp(const void *b1, const void *b2, size_t len);
+#endif
+
/* Logging. */
typedef enum _LogParameter {
XLOG_FLUSH,