diff options
| -rw-r--r-- | package/cryptodev-linux/Makefile | 10 | ||||
| -rw-r--r-- | package/cryptodev-linux/patches/patch-cryptlib_c | 25 | ||||
| -rw-r--r-- | package/cryptodev-linux/patches/patch-zc_c | 25 |
3 files changed, 4 insertions, 56 deletions
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index cb3c76085..639299b56 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -4,18 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cryptodev-linux -PKG_VERSION:= 1.8 +PKG_VERSION:= 6818263667ca488f9b1c86e36ea624c4ea1c309f +PKG_GIT:= hash PKG_RELEASE:= 1 -PKG_HASH:= 67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376 PKG_DESCR:= device that allows access to kernel cryptographic drivers PKG_SECTION:= app/crypto PKG_DEPENDS:= libressl PKG_BUILDDEP:= libressl PKG_KDEPENDS:= crypto-aead crypto-algapi crypto-manager PKG_URL:= http://home.gna.org/cryptodev-linux/ -PKG_SITES:= http://download.gna.org/cryptodev-linux/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_SITES:= https://github.com/cryptodev-linux/cryptodev-linux.git include $(ADK_TOPDIR)/mk/package.mk include ${ADK_TOPDIR}/mk/kernel-ver.mk @@ -23,7 +21,7 @@ include ${ADK_TOPDIR}/mk/kernel-vars.mk $(eval $(call PKG_template,CRYPTODEV_LINUX,cryptodev-linux,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -XAKE_FLAGS+= CRYPTODEV_CFLAGS='-DENABLE_ASYNC -fhonour-copts' \ +XAKE_FLAGS+= CRYPTODEV_CFLAGS='-DENABLE_ASYNC' CONFIG_STYLE:= manual BUILD_STYLE:= manual diff --git a/package/cryptodev-linux/patches/patch-cryptlib_c b/package/cryptodev-linux/patches/patch-cryptlib_c deleted file mode 100644 index 02e8d9b35..000000000 --- a/package/cryptodev-linux/patches/patch-cryptlib_c +++ /dev/null @@ -1,25 +0,0 @@ ---- cryptodev-linux-1.8.orig/cryptlib.c 2015-11-28 02:07:11.000000000 +0100 -+++ cryptodev-linux-1.8/cryptlib.c 2016-12-13 02:21:39.899840926 +0100 -@@ -36,6 +36,7 @@ - #include <crypto/aead.h> - #include <linux/rtnetlink.h> - #include <crypto/authenc.h> -+#include <crypto/skcipher.h> - #include "cryptodev_int.h" - - -@@ -131,11 +132,13 @@ int cryptodev_cipher_init(struct cipher_ - uint8_t *keyp, size_t keylen, int stream, int aead) - { - int ret; -+ struct crypto_skcipher *tfm; - - if (aead == 0) { - struct ablkcipher_alg *alg; - -- out->async.s = crypto_alloc_ablkcipher(alg_name, 0, 0); -+ tfm = crypto_alloc_skcipher(alg_name, 0, 0); -+ out->async.s->base = tfm->base; - if (unlikely(IS_ERR(out->async.s))) { - ddebug(1, "Failed to load cipher %s", alg_name); - return -EINVAL; diff --git a/package/cryptodev-linux/patches/patch-zc_c b/package/cryptodev-linux/patches/patch-zc_c deleted file mode 100644 index d16051b4a..000000000 --- a/package/cryptodev-linux/patches/patch-zc_c +++ /dev/null @@ -1,25 +0,0 @@ ---- cryptodev-linux-1.8.orig/zc.c 2015-11-28 02:07:11.000000000 +0100 -+++ cryptodev-linux-1.8/zc.c 2016-09-29 03:07:39.505502335 +0200 -@@ -59,7 +59,12 @@ int __get_userbuf(uint8_t __user *addr, - } - - down_read(&mm->mmap_sem); -- ret = get_user_pages(task, mm, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)) -+ ret = get_user_pages_remote( -+#else -+ ret = get_user_pages( -+#endif -+ task, mm, - (unsigned long)addr, pgcount, write, 0, pg, NULL); - up_read(&mm->mmap_sem); - if (ret != pgcount) -@@ -119,7 +124,7 @@ void release_user_pages(struct csession - else - ses->readonly_pages--; - -- page_cache_release(ses->pages[i]); -+ put_page(ses->pages[i]); - } - ses->used_pages = 0; - } |