Moved cryptodev to accelerated/

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c80c301c9ad216d5c8d393f23d24ceac581799f2..0e7751ee1d4b8732d6111950d65d1976d619015c 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -68,7 +68,7 @@ COBJECTS = gnutls_record.c gnutls_compress.c debug.c gnutls_cipher.c  \
        gnutls_datum.c gnutls_session_pack.c gnutls_mpi.c       \
        gnutls_pk.c gnutls_cert.c gnutls_global.c gnutls_constate.c     \
        gnutls_anon_cred.c pkix_asn1_tab.c gnutls_asn1_tab.c            \
-       gnutls_mem.c gnutls_ui.c gnutls_sig.c cryptodev.c       \
+       gnutls_mem.c gnutls_ui.c gnutls_sig.c                           \
        gnutls_dh_primes.c gnutls_alert.c system.c              \
        gnutls_str.c gnutls_state.c gnutls_x509.c gnutls_rsa_export.c   \
        gnutls_helper.c gnutls_supplemental.c crypto.c random.c  \
@@ -95,7 +95,6 @@ HFILES = abstract_int.h debug.h gnutls_compress.h gnutls_cipher.h     \
        gnutls_state.h gnutls_x509.h                    \
        gnutls_rsa_export.h gnutls_srp.h auth/srp.h auth/srp_passwd.h   \
        gnutls_helper.h gnutls_supplemental.h crypto.h random.h system.h\
-       gnutls_cryptodev.h              \
        locks.h gnutls_mbuffers.h pkcs11_int.h \
        hash.h
 

diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index 6cccae53e8d092d1d8398738a3fea09cb7a8bf87..7657ab2f346c8589ee53b732a2555c4257e5744b 100644 (file)
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -35,8 +35,8 @@ endif
 
 noinst_LTLIBRARIES = libaccelerated.la
 
-EXTRA_DIST = x86.h accelerated.h
-libaccelerated_la_SOURCES = accelerated.c
+EXTRA_DIST = x86.h accelerated.h gnutls_cryptodev.h
+libaccelerated_la_SOURCES = accelerated.c cryptodev.c
 libaccelerated_la_LIBADD =
 
 if TRY_X86_OPTIMIZATIONS

diff --git a/lib/cryptodev.c b/lib/accelerated/cryptodev.c
similarity index 100%
rename from lib/cryptodev.c
rename to lib/accelerated/cryptodev.c

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

diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c
index 3c7f263968d5cd7adc1e03f8360ee30b8461fc3b..7a424cc5fc70d6a1f954952c47f5cf4507d21beb 100644 (file)
--- a/lib/gnutls_global.c
+++ b/lib/gnutls_global.c
@@ -31,8 +31,8 @@
 #include <gnutls/pkcs11.h>
 
 #include <gnutls_extensions.h>  /* for _gnutls_ext_init */
-#include <gnutls_cryptodev.h>
 #include <locks.h>
+#include <accelerated/cryptodev.h>
 #include <accelerated/accelerated.h>
 
 #include "sockets.h"