diff options
| author | Andreas Metzler <gitlab@bebt.de> | 2021-02-13 18:50:18 +0000 |
|---|---|---|
| committer | Andreas Metzler <gitlab@bebt.de> | 2021-02-13 18:50:18 +0000 |
| commit | 9db8723d9c21779256fbf3f72df4c5193586ee4d (patch) | |
| tree | 3ca87e3726b5a718de0bafb88986900e3084f63b | |
| parent | 2ea09dff25c74a4da598efdc62e7d3b42a11727c (diff) | |
| parent | 27efa40dcfb9218bf4c5b93a08d2aec3b082a6cf (diff) | |
| download | gnutls-9db8723d9c21779256fbf3f72df4c5193586ee4d.tar.gz | |
Merge branch 'tmp-tests-missing-nettle-cflags' into 'master'
Fix test error with nettle in non-default location
See merge request gnutls/gnutls!1386
| -rw-r--r-- | lib/cipher.c | 2 | ||||
| -rw-r--r-- | lib/gnutls_int.h | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 27 |
3 files changed, 11 insertions, 20 deletions
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 \ |