diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-16 00:48:46 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-16 00:48:46 +0200 |
commit | 9fc1e40accd9c74cfd409b563bf29a700cdb8fcc (patch) | |
tree | c599cbab40951dcde08cbcda129c410fa96503d5 | |
parent | fa5cfc8beb6a6fe9fffb06baaf92ae9d900c6105 (diff) | |
download | gnutls-9fc1e40accd9c74cfd409b563bf29a700cdb8fcc.tar.gz |
Moved cryptodev to accelerated/
-rw-r--r-- | lib/Makefile.am | 3 | ||||
-rw-r--r-- | lib/accelerated/Makefile.am | 4 | ||||
-rw-r--r-- | lib/accelerated/cryptodev.c (renamed from lib/cryptodev.c) | 0 | ||||
-rw-r--r-- | lib/accelerated/cryptodev.h (renamed from lib/gnutls_cryptodev.h) | 0 | ||||
-rw-r--r-- | lib/gnutls_global.c | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index c80c301c9a..0e7751ee1d 100644 --- 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 6cccae53e8..7657ab2f34 100644 --- 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 index 4e09c4d108..4e09c4d108 100644 --- a/lib/cryptodev.c +++ b/lib/accelerated/cryptodev.c diff --git a/lib/gnutls_cryptodev.h b/lib/accelerated/cryptodev.h index ff9ce4878a..ff9ce4878a 100644 --- a/lib/gnutls_cryptodev.h +++ b/lib/accelerated/cryptodev.h diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c index 3c7f263968..7a424cc5fc 100644 --- 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" |