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/os/Imakefile | |
| 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/os/Imakefile')
| -rw-r--r-- | nx-X11/programs/Xserver/os/Imakefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index 2abc1aff9..8b260fa32 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -115,17 +115,22 @@ GETPEER_DEFINES = -DHAS_GETPEEREID # endif #endif +#if !HasTimingsafeMemcmp +TMEMCMP_SRCS = timingsafe_memcmp.c +TMEMCMP_OBJS = timingsafe_memcmp.o +#endif + BOOTSTRAPCFLAGS = SRCS = WaitFor.c access.c connection.c io.c $(COLOR_SRCS) \ osinit.c utils.c log.c auth.c mitauth.c secauth.c \ $(XDMAUTHSRCS) $(RPCSRCS) xdmcp.c OtherSources \ xstrans.c $(SNPRINTF_SRCS) $(STRLCAT_SRCS) \ - $(REALLOCARRAY_SRCS) xprintf.c + $(REALLOCARRAY_SRCS) xprintf.c $(TMEMCMP_SRCS) OBJS = WaitFor.o access.o connection.o io.o $(COLOR_OBJS) \ osinit.o utils.o log.o auth.o mitauth.o secauth.o \ $(XDMAUTHOBJS) $(RPCOBJS) xdmcp.o OtherObjects \ xstrans.o $(SNPRINTF_OBJS) $(STRLCAT_OBJS) \ - $(REALLOCARRAY_OBJS) xprintf.o + $(REALLOCARRAY_OBJS) xprintf.o $(TMEMCMP_OBJS) #if UseMemLeak MEM_DEFINES = -DMEMBUG |