x86.h was renamed to x86-common.h to avoid clashes with system headers.

diff --git a/lib/accelerated/accelerated.c b/lib/accelerated/accelerated.c
index dc2ba46e1c3e622d0a5d8433d11cbdf98875ba1a..aa7044990cbcb8d7af992e06251ff48c8f90e57c 100644 (file)
--- a/lib/accelerated/accelerated.c
+++ b/lib/accelerated/accelerated.c
@@ -24,7 +24,7 @@
 #include <accelerated.h>
 #if defined(ASM_X86)
 #include <x86/aes-x86.h>
-#include <x86/x86.h>
+#include <x86/x86-common.h>
 #endif
 
 void _gnutls_register_accel_crypto(void)

diff --git a/lib/accelerated/x86/Makefile.am b/lib/accelerated/x86/Makefile.am
index c0e71cc06b30fdcd4db4c1d80a111ac8521f06b1..e6bb21571102018d5e5507aef5a3525583270250 100644 (file)
--- a/lib/accelerated/x86/Makefile.am
+++ b/lib/accelerated/x86/Makefile.am
@@ -36,7 +36,7 @@ EXTRA_DIST = README license.txt files.mk
 noinst_LTLIBRARIES = libx86.la
 
 libx86_la_SOURCES = sha-padlock.c hmac-padlock.c x86-common.c aes-padlock.c aes-gcm-padlock.c \
-       aes-padlock.h aes-x86.h x86.h sha-padlock.h sha-x86-ssse3.c sha-x86.h hmac-x86-ssse3.c \
+       aes-padlock.h aes-x86.h x86-common.h sha-padlock.h sha-x86-ssse3.c sha-x86.h hmac-x86-ssse3.c \
        aes-gcm-x86-ssse3.c aes-gcm-x86-aesni.c aes-cbc-x86-ssse3.c aes-cbc-x86-aesni.c
 
 include files.mk

diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c
index 1a2681f4d3cc3798bc1e24697e434e2fc1576099..74a67e7da4e662651db583f6a85fd00235a726c3 100644 (file)
--- a/lib/accelerated/x86/aes-cbc-x86-aesni.c
+++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c
@@ -31,7 +31,7 @@
 #include <gnutls_errors.h>
 #include <aes-x86.h>
 #include <sha-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 
 struct aes_ctx {
        AES_KEY expanded_key;

diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
index 2b2440a5d4281668082a2cb6d7df0a6d0b4a645d..0617d203c8e149bb948cf41d12a2ddcb8b14f650 100644 (file)
--- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c
+++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
@@ -31,7 +31,7 @@
 #include <gnutls_errors.h>
 #include <aes-x86.h>
 #include <sha-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 
 struct aes_ctx {
        AES_KEY expanded_key;

diff --git a/lib/accelerated/x86/aes-gcm-padlock.c b/lib/accelerated/x86/aes-gcm-padlock.c
index 4b49521fd92018d8fc6ec6229357bfad4240dbf0..e1ad56699bca718a04d6f443441bc6719705274e 100644 (file)
--- a/lib/accelerated/x86/aes-gcm-padlock.c
+++ b/lib/accelerated/x86/aes-gcm-padlock.c
@@ -32,7 +32,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #include <byteswap.h>
 #include <nettle/gcm.h>
 #include <aes-padlock.h>

diff --git a/lib/accelerated/x86/aes-gcm-x86-aesni.c b/lib/accelerated/x86/aes-gcm-x86-aesni.c
index 55bc5b0fabaaaab421cdabf04d773282789e80f2..7428940d3d6abcae87ca820e9648f56baea18211 100644 (file)
--- a/lib/accelerated/x86/aes-gcm-x86-aesni.c
+++ b/lib/accelerated/x86/aes-gcm-x86-aesni.c
@@ -33,7 +33,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #include <byteswap.h>
 #include <nettle/gcm.h>
 #include <aes-x86.h>

diff --git a/lib/accelerated/x86/aes-gcm-x86-pclmul.c b/lib/accelerated/x86/aes-gcm-x86-pclmul.c
index c5f23b5abef8dfa75044fb4dab9734da6ec916ec..1e52a70b18ab836013ad25bfd00fe4646ce961bb 100644 (file)
--- a/lib/accelerated/x86/aes-gcm-x86-pclmul.c
+++ b/lib/accelerated/x86/aes-gcm-x86-pclmul.c
@@ -30,7 +30,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #include <byteswap.h>
 
 #define GCM_BLOCK_SIZE 16

diff --git a/lib/accelerated/x86/aes-gcm-x86-ssse3.c b/lib/accelerated/x86/aes-gcm-x86-ssse3.c
index 68332387cc0382d4cb5f6b1ef529fd2e4f347aff..026ffb23b50dc7c013e9909acadb2dd7ffe5e41e 100644 (file)
--- a/lib/accelerated/x86/aes-gcm-x86-ssse3.c
+++ b/lib/accelerated/x86/aes-gcm-x86-ssse3.c
@@ -32,7 +32,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #include <byteswap.h>
 #include <nettle/gcm.h>
 #include <aes-x86.h>

diff --git a/lib/accelerated/x86/aes-padlock.c b/lib/accelerated/x86/aes-padlock.c
index adc7e00394630de51118167d0e042897d9efa38a..98cdfc274b0767d2a26971b67c85348ee2fba4a2 100644 (file)
--- a/lib/accelerated/x86/aes-padlock.c
+++ b/lib/accelerated/x86/aes-padlock.c
@@ -30,7 +30,7 @@
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
 #include <aes-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #ifdef HAVE_LIBNETTLE
 # include <nettle/aes.h>               /* for key generation in 192 and 256 bits */
 # include <sha-padlock.h>

diff --git a/lib/accelerated/x86/sha-padlock.c b/lib/accelerated/x86/sha-padlock.c
index 3875cfca43cadd9467a22a12c1e7b97286bb3ff9..7365f6c0c6821004cbedaad0e0ac61d4d1b05610 100644 (file)
--- a/lib/accelerated/x86/sha-padlock.c
+++ b/lib/accelerated/x86/sha-padlock.c
@@ -30,7 +30,7 @@
 #include <aes-padlock.h>
 #include <assert.h>
 #include <sha-padlock.h>
-#include <x86.h>
+#include <x86-common.h>
 
 #ifdef HAVE_LIBNETTLE
 

diff --git a/lib/accelerated/x86/sha-x86-ssse3.c b/lib/accelerated/x86/sha-x86-ssse3.c
index 25b347b585619f03d131c12baa6f5c90e5ee0ccf..17724f71ce60d394f267ce1fd1c575ff8785f1cd 100644 (file)
--- a/lib/accelerated/x86/sha-x86-ssse3.c
+++ b/lib/accelerated/x86/sha-x86-ssse3.c
@@ -29,7 +29,7 @@
 #include <nettle/macros.h>
 #include <nettle/nettle-meta.h>
 #include <sha-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 
 void sha1_block_data_order(void *c, const void *p, size_t len);
 void sha256_block_data_order(void *c, const void *p, size_t len);

diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
index 1c19a6606a8fccbf20ace77e14983d33e2bd689c..166cd257a5d99cbd9975fa824099d389f73fc6da 100644 (file)
--- a/lib/accelerated/x86/x86-common.c
+++ b/lib/accelerated/x86/x86-common.c
@@ -31,7 +31,7 @@
 #include <gnutls_errors.h>
 #include <aes-x86.h>
 #include <sha-x86.h>
-#include <x86.h>
+#include <x86-common.h>
 #ifdef HAVE_LIBNETTLE
 # include <nettle/aes.h>               /* for key generation in 192 and 256 bits */
 # include <sha-padlock.h>

diff --git a/lib/accelerated/x86/x86.h b/lib/accelerated/x86/x86-common.h
similarity index 100%
rename from lib/accelerated/x86/x86.h
rename to lib/accelerated/x86/x86-common.h