From: Andreas Metzler <ametzler@bebt.de>
Date: Tue, 9 Feb 2021 13:16:54 +0000 (+0100)
Subject: Fix test error with nettle in non-default location
X-Git-Tag: 3.7.1~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27efa40dcfb9218bf4c5b93a08d2aec3b082a6cf;p=thirdparty%2Fgnutls.git

Fix test error with nettle in non-default location

Move #include <nettle/memxor.h> from gnutls_int.h to lib/cipher.c, drop
now superfluous NETTLE_CFLAGS from CPPFLAGS of multiple tests #including
gnutls_int.h.

Signed-off-by: Andreas Metzler <ametzler@bebt.de>
---

diff --git a/lib/cipher.c b/lib/cipher.c
index 275c57a4e8..90ab1d3a9b 100644
--- a/lib/cipher.c
+++ b/lib/cipher.c
@@ -42,6 +42,8 @@
 #include <state.h>
 #include <random.h>
 
+#include <nettle/memxor.h>
+
 static int encrypt_packet(gnutls_session_t session,
 			    uint8_t * cipher_data, int cipher_size,
 			    gnutls_datum_t * plain,
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 5eb47b4bdf..2611b5af54 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -53,8 +53,6 @@ typedef int ssize_t;
 #endif
 #include <time.h>
 
-#include <nettle/memxor.h>
-
 #include "attribute.h"
 
 #define ENABLE_ALIGN16
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8f7972a7d5..5ab6cb4ce5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -257,13 +257,11 @@ tls12_rehandshake_cert_LDADD = $(CMOCKA_LDADD)
 
 gnutls_record_overhead_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\
-	-I$(top_builddir)/gl	\
-	$(NETTLE_CFLAGS)
+	-I$(top_builddir)/gl
 
 ip_utils_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\
-	-I$(top_builddir)/gl	\
-	$(NETTLE_CFLAGS)
+	-I$(top_builddir)/gl
 
 endif
 
@@ -439,38 +437,31 @@ endif
 
 gc_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\
-	-I$(top_builddir)/gl	\
-	$(NETTLE_CFLAGS)
+	-I$(top_builddir)/gl
 
 mpi_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\
-	-I$(top_builddir)/gl	\
-	$(NETTLE_CFLAGS)
+	-I$(top_builddir)/gl
 
 atfork_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\
-	-I$(top_builddir)/gl	\
-	$(NETTLE_CFLAGS)
+	-I$(top_builddir)/gl
 
 pkcs12_s2k_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\
-	-I$(top_builddir)/gl	\
-	$(NETTLE_CFLAGS)
+	-I$(top_builddir)/gl
 
 name_constraints_merge_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\
-	-I$(top_builddir)/gl	\
-	$(NETTLE_CFLAGS)
+	-I$(top_builddir)/gl
 
 murmur3_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\
-	-I$(top_builddir)/gl	\
-	$(NETTLE_CFLAGS)
+	-I$(top_builddir)/gl
 
 tls13_anti_replay_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\
-	-I$(top_builddir)/gl	\
-	$(NETTLE_CFLAGS)
+	-I$(top_builddir)/gl
 
 iov_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(top_srcdir)/gl	\