./0000775000175000017500000000000012511411357011435 5ustar nielsenrnielsenr./0002-In-the-3.13-rc1-Linux-kernel-the-INIT_COMPLETION-mac.patch0000664000175000017500000000556312511411357023420 0ustar nielsenrnielsenrFrom 57b5544de80db85c8955499831fdaa30829db77a Mon Sep 17 00:00:00 2001 From: Cosmin Paraschiv Date: Thu, 23 Jan 2014 03:40:00 +0100 Subject: [PATCH] In the 3.13-rc1 Linux kernel, the INIT_COMPLETION macro has been replaced with an inline function, reinit_completion [1][2]. We are currently using the 3.13-rc3 Linux kernel, which leads to the following error: cryptlib.c:279:2: error: implicit declaration of function 'INIT_COMPLETION' [-Werror=implicit-function-declaration] INIT_COMPLETION(cdata->async.result->completion); [1] https://github.com/torvalds/linux/commit/c32f74ab2872994bc8336ed367313da3139350ca [2] https://github.com/torvalds/linux/commit/62026aedaacedbe1ffe94a3599ad4acd8ecdf587 Signed-off-by: Cosmin Paraschiv Reviewed-by: Cristian Stoica Tested-by: Cristian Stoica Signed-off-by: Horia Geanta Signed-off-by: Phil Sutter Upstream-Status: Backport --- cryptlib.c | 8 ++++---- cryptodev_int.h | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cryptlib.c b/cryptlib.c index 54d5d41..a923c14 100644 --- a/cryptlib.c +++ b/cryptlib.c @@ -217,7 +217,7 @@ ssize_t cryptodev_cipher_encrypt(struct cipher_data *cdata, { int ret; - INIT_COMPLETION(cdata->async.result->completion); + reinit_completion(&cdata->async.result->completion); if (cdata->aead == 0) { ablkcipher_request_set_crypt(cdata->async.request, @@ -240,7 +240,7 @@ ssize_t cryptodev_cipher_decrypt(struct cipher_data *cdata, { int ret; - INIT_COMPLETION(cdata->async.result->completion); + reinit_completion(&cdata->async.result->completion); if (cdata->aead == 0) { ablkcipher_request_set_crypt(cdata->async.request, (struct scatterlist *)src, dst, @@ -351,7 +351,7 @@ ssize_t cryptodev_hash_update(struct hash_data *hdata, { int ret; - INIT_COMPLETION(hdata->async.result->completion); + reinit_completion(&hdata->async.result->completion); ahash_request_set_crypt(hdata->async.request, sg, NULL, len); ret = crypto_ahash_update(hdata->async.request); @@ -363,7 +363,7 @@ int cryptodev_hash_final(struct hash_data *hdata, void* output) { int ret; - INIT_COMPLETION(hdata->async.result->completion); + reinit_completion(&hdata->async.result->completion); ahash_request_set_crypt(hdata->async.request, NULL, output, 0); ret = crypto_ahash_final(hdata->async.request); diff --git a/cryptodev_int.h b/cryptodev_int.h index 12dd5b1..188063d 100644 --- a/cryptodev_int.h +++ b/cryptodev_int.h @@ -2,6 +2,12 @@ #ifndef CRYPTODEV_INT_H # define CRYPTODEV_INT_H +#include + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)) +# define reinit_completion(x) INIT_COMPLETION(*(x)) +#endif + #include #include #include -- 1.9.1 ./0001-Disable-installing-header-file-provided-by-another-p.patch0000664000175000017500000000143012511411357025017 0ustar nielsenrnielsenrFrom 8a884f55bd1527baa82fab68c186ba546273860c Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Sun, 6 Apr 2014 19:51:39 -0400 Subject: [PATCH] Disable installing header file provided by another package Signed-off-by: Denys Dmytriyenko Upstream-Status: Inappropriate [ OE specific ] --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index d66ef26..8e97c6a 100644 --- a/Makefile +++ b/Makefile @@ -23,8 +23,6 @@ install: modules_install modules_install: make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install - @echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..." - @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h clean: make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean -- 1.9.1 ./0002-Fix-tests-Makefile-usage-of-LDLIBS-vs.-LDFLAGS.patch0000664000175000017500000000145112511411357022670 0ustar nielsenrnielsenrFrom 47ff1eb9bb4f872c1d731b93d334ee5865bf3439 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Sun, 6 Apr 2014 22:16:30 -0400 Subject: [PATCH] Fix tests Makefile usage of LDLIBS vs. LDFLAGS Libraries must come after objects, as link order matters, especially when using linker flags like -Wl,--as-needed. Signed-off-by: Denys Dmytriyenko Upstream-Status: Pending --- tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile b/tests/Makefile index cd202af..67c3c83 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -39,5 +39,5 @@ testprogs: $(hostprogs) clean: rm -f *.o *~ $(hostprogs) -${comp_progs}: LDFLAGS += -lssl -lcrypto +${comp_progs}: LDLIBS += -lssl -lcrypto ${comp_progs}: %: %.o openssl_wrapper.o -- 1.9.1 ./0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch0000664000175000017500000000330312511411357025041 0ustar nielsenrnielsenrFrom 1980a8f4779a955e73285e7a0d86549b69bea5c8 Mon Sep 17 00:00:00 2001 From: Yu Zongchun Date: Sun, 28 Apr 2013 14:39:22 +0800 Subject: [PATCH] Add the compile and install rules for cryptodev tests folder This is required to install the cryptodev tests folder to rootfs Signed-off-by: Yu Zongchun Upstream-Status: Pending --- Makefile | 6 ++++++ tests/Makefile | 8 ++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 2be8825..4cbb865 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,9 @@ install: @echo "Installing cryptodev.h in /usr/include/crypto ..." @install -D crypto/cryptodev.h /usr/include/crypto/cryptodev.h +install_tests: + make -C tests install DESTDIR=$(PREFIX) + clean: make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean rm -f $(hostprogs) *~ @@ -25,6 +28,9 @@ clean: check: KERNEL_DIR=$(KERNEL_DIR) make -C tests check +testprogs: + KERNEL_DIR=$(KERNEL_DIR) make -C tests testprogs + FILEBASE = cryptodev-linux-$(VERSION) TMPDIR ?= /tmp OUTPUT = $(FILEBASE).tar.gz diff --git a/tests/Makefile b/tests/Makefile index 87ca3c7..0488cf6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -19,6 +19,12 @@ example-async-hmac-objs := async_hmac.o example-async-speed-objs := async_speed.o example-hashcrypt-speed-objs := hashcrypt_speed.c +install: + install -d $(DESTDIR)/usr/bin/tests_cryptodev + for bin in $(hostprogs); do \ + install -m 755 $${bin} $(DESTDIR)/usr/bin/tests_cryptodev/; \ + done + check: $(hostprogs) ./cipher ./hmac @@ -28,6 +34,8 @@ check: $(hostprogs) ./cipher-gcm ./cipher-aead +testprogs: $(hostprogs) + clean: rm -f *.o *~ $(hostprogs) -- 1.7.5.4