diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-07 22:34:09 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-07 22:34:09 +0100 |
| commit | c6f0e6b2c6164b7a0c160222f4af8f45e97153c1 (patch) | |
| tree | 741bdcc3a30b7b2e23a57c377ca057db38803129 /nx-X11/programs/Xserver/include | |
| parent | 05aabb4e6f45bcb2c951ec04026f9d7bce7335b3 (diff) | |
| parent | 22f542626cf9935fd55a899e21144111e481542c (diff) | |
| download | nx-libs-c6f0e6b2c6164b7a0c160222f4af8f45e97153c1.tar.gz nx-libs-c6f0e6b2c6164b7a0c160222f4af8f45e97153c1.tar.bz2 nx-libs-c6f0e6b2c6164b7a0c160222f4af8f45e97153c1.zip | |
Merge branch 'uli42-pr/cve-2017-2624' into 3.6.x
Attributes GH PR #380: https://github.com/ArcticaProject/nx-libs/pull/380
Fixes: ArcticaProject/nx-libs#365.
Diffstat (limited to 'nx-X11/programs/Xserver/include')
| -rw-r--r-- | nx-X11/programs/Xserver/include/os.h | 5 |
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, |