diff options
| -rw-r--r-- | package/cryptodev-linux/Makefile | 6 | ||||
| -rw-r--r-- | package/cryptodev-linux/patches/patch-cryptlib_c | 38 | ||||
| -rw-r--r-- | package/cryptodev-linux/patches/patch-ioctl_c | 11 | ||||
| -rw-r--r-- | package/cryptodev-linux/patches/patch-tests_Makefile | 4 |
4 files changed, 16 insertions, 43 deletions
diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index 0cee1565f..b02bcaf4c 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= cryptodev-linux -PKG_VERSION:= 1.6 -PKG_RELEASE:= 3 -PKG_HASH:= 75f1425c8ea1f8cae523905a5a046a35092327a6152800b0b86efc4e56fb3e2f +PKG_VERSION:= 1.7 +PKG_RELEASE:= 1 +PKG_HASH:= 41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25 PKG_DESCR:= device that allows access to kernel cryptographic drivers PKG_SECTION:= app/crypto PKG_BUILDDEP:= openssl diff --git a/package/cryptodev-linux/patches/patch-cryptlib_c b/package/cryptodev-linux/patches/patch-cryptlib_c deleted file mode 100644 index 54f1684f5..000000000 --- a/package/cryptodev-linux/patches/patch-cryptlib_c +++ /dev/null @@ -1,38 +0,0 @@ ---- cryptodev-linux-1.6.orig/cryptlib.c 2013-01-30 17:13:50.000000000 +0100 -+++ cryptodev-linux-1.6/cryptlib.c 2014-02-21 14:33:04.000000000 +0100 -@@ -220,7 +220,7 @@ ssize_t cryptodev_cipher_encrypt(struct - { - 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, -@@ -243,7 +243,7 @@ ssize_t cryptodev_cipher_decrypt(struct - { - 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, -@@ -355,7 +355,7 @@ ssize_t cryptodev_hash_update(struct has - { - 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); -@@ -367,7 +367,7 @@ int cryptodev_hash_final(struct hash_dat - { - 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/package/cryptodev-linux/patches/patch-ioctl_c b/package/cryptodev-linux/patches/patch-ioctl_c new file mode 100644 index 000000000..9af8f27d5 --- /dev/null +++ b/package/cryptodev-linux/patches/patch-ioctl_c @@ -0,0 +1,11 @@ +--- cryptodev-linux-1.7.orig/ioctl.c 2015-02-07 15:31:23.000000000 -0600 ++++ cryptodev-linux-1.7/ioctl.c 2015-02-19 14:47:24.775772135 -0600 +@@ -546,7 +546,7 @@ static int + clonefd(struct file *filp) + { + int ret; +- ret = get_unused_fd(); ++ ret = get_unused_fd_flags(0); + if (ret >= 0) { + get_file(filp); + fd_install(ret, filp); diff --git a/package/cryptodev-linux/patches/patch-tests_Makefile b/package/cryptodev-linux/patches/patch-tests_Makefile index 4f774260f..ac966c450 100644 --- a/package/cryptodev-linux/patches/patch-tests_Makefile +++ b/package/cryptodev-linux/patches/patch-tests_Makefile @@ -1,5 +1,5 @@ ---- cryptodev-linux-1.6.orig/tests/Makefile 2013-03-04 04:59:29.000000000 +0100 -+++ cryptodev-linux-1.6/tests/Makefile 2013-07-17 14:45:18.000000000 +0200 +--- cryptodev-linux-1.7.orig/tests/Makefile 2015-02-07 15:31:23.000000000 -0600 ++++ cryptodev-linux-1.7/tests/Makefile 2015-02-19 14:40:46.523775781 -0600 @@ -20,13 +20,6 @@ example-async-speed-objs := async_speed. example-hashcrypt-speed-objs := hashcrypt_speed.c |