Merge pull request #3734 from gilles-peskine-arm/entropy_poll-_gnu_source-development

Don't redefine _GNU_SOURCE if it's already defined

ChangeLog.d/_GNU_SOURCE-redefined.txt

@@ -0,0 +1,3 @@
+Bugfix
+   * Fix the build when the macro _GNU_SOURCE is defined to a non-empty value.
+     Fix #3432.

ChangeLog.d/getrandom.txt

@@ -1,2 +0,0 @@
-Changes
-   Use glibc's getrandom() instead of syscall when glibc > 2.25.

library/entropy_poll.c

@@ -17,16 +17,10 @@
  *  limitations under the License.
  */
 
-#if defined(__linux__)
-#if !defined(_GNU_SOURCE)
+#if defined(__linux__) && !defined(_GNU_SOURCE)
 /* Ensure that syscall() is available even when compiling with -std=c99 */
 #define _GNU_SOURCE
 #endif
-#include <features.h>
-#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 25)
-#define HAVE_SYS_RANDOM 1
-#endif
-#endif
 
 #include "common.h"
 
@@ -92,16 +86,10 @@ int mbedtls_platform_entropy_poll( void *data, unsigned char *output, size_t len
 
 /*
  * Test for Linux getrandom() support.
- * When the C library is GNU libc and its version is greater than 2.25,
- * include sys/random.h to use getrandom(),
- * otherwise use the generic use the generic syscall wrapper
+ * Since there is no wrapper in the libc yet, use the generic syscall wrapper
  * available in GNU libc and compatible libc's (eg uClibc).
  */
-#if HAVE_SYS_RANDOM
-#include <sys/random.h>
-#include <errno.h>
-#define HAVE_GETRANDOM
-#elif (defined(__linux__) && defined(__GLIBC__)) || defined(__midipix__)
+#if ((defined(__linux__) && defined(__GLIBC__)) || defined(__midipix__))
 #include <unistd.h>
 #include <sys/syscall.h>
 #if defined(SYS_getrandom)
@@ -167,11 +155,7 @@ int mbedtls_platform_entropy_poll( void *data,
     ((void) data);
 
 #if defined(HAVE_GETRANDOM)
-#if HAVE_SYS_RANDOM
-    ret = getrandom(output, len, 0);
-#else
     ret = getrandom_wrapper( output, len, 0 );
-#endif
     if( ret >= 0 )
     {
         *olen = ret;