diff options
| author | Petri Lehtinen <petri@digip.org> | 2014-01-14 11:16:39 +0200 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2014-02-11 08:41:30 +0200 |
| commit | 8f80c2d83808150724d31793e6ade92749b1faa4 (patch) | |
| tree | ccfc4d5544ff59d85c871096964c81aea6eb495b /cmake | |
| parent | b9c588de3deb4efdd7b9ec44aa79335dba11fd6b (diff) | |
| download | jansson-8f80c2d83808150724d31793e6ade92749b1faa4.zip jansson-8f80c2d83808150724d31793e6ade92749b1faa4.tar.gz jansson-8f80c2d83808150724d31793e6ade92749b1faa4.tar.bz2 | |
CVE-2013-6401: Change hash function, randomize hashes
Thanks to Florian Weimer and Eric Sesterhenn for reporting, reviewing
and testing.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/config.h.cmake | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index bc81178..b27b9a3 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -1,35 +1,36 @@ -/* Reduced down to the defines that are actually used in the code */ - -/* Define to 1 if you have the <inttypes.h> (and friends) header file. */ -#cmakedefine HAVE_INTTYPES_H 1 -#cmakedefine HAVE_STDINT_H 1 +#cmakedefine HAVE_ENDIAN_H 1 +#cmakedefine HAVE_FCNTL_H 1 +#cmakedefine HAVE_SCHED_H 1 +#cmakedefine HAVE_UNISTD_H 1 +#cmakedefine HAVE_SYS_PARAM_H 1 +#cmakedefine HAVE_SYS_STAT_H 1 +#cmakedefine HAVE_SYS_TIME_H 1 #cmakedefine HAVE_SYS_TYPES_H 1 +#cmakedefine HAVE_STDINT_H 1 -/* We must include this here, as in (eg) utf.h it will want to use - the integer type, which in MSVC2010 will be in stdint.h - (there is no inttypes.h in MSVC2010) */ -#if defined(HAVE_STDINT_H) -# include <stdint.h> -#elif defined(HAVE_INTTYPES_H) -# include <inttypes.h> -#elif defined(HAVE_SYS_TYPES_H) -# include <sys/types.h> -#endif +#cmakedefine HAVE_CLOSE 1 +#cmakedefine HAVE_GETPID 1 +#cmakedefine HAVE_GETTIMEOFDAY 1 +#cmakedefine HAVE_OPEN 1 +#cmakedefine HAVE_READ 1 +#cmakedefine HAVE_SCHED_YIELD 1 -/* Define to 1 if you have the <locale.h> header file. */ -#cmakedefine HAVE_LOCALE_H 1 +#cmakedefine HAVE_SYNC_BUILTINS 1 +#cmakedefine HAVE_ATOMIC_BUILTINS 1 -/* Define to 1 if you have the 'setlocale' function. */ +#cmakedefine HAVE_LOCALE_H 1 #cmakedefine HAVE_SETLOCALE 1 -/* Define to the type of a signed integer type of width exactly 32 bits if - such a type exists and the standard includes do not define it. */ #cmakedefine HAVE_INT32_T 1 - #ifndef HAVE_INT32_T # define int32_t @JSON_INT32@ #endif +#cmakedefine HAVE_UINT32_T 1 +#ifndef HAVE_UINT32_T +# define uint32_t @JSON_UINT32@ +#endif + #cmakedefine HAVE_SSIZE_T 1 #ifndef HAVE_SSIZE_T @@ -43,3 +44,6 @@ #endif #cmakedefine HAVE_VSNPRINTF + +#cmakedefine USE_URANDOM 1 +#cmakedefine USE_WINDOWS_CRYPTOAPI 1 |