diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 20:40:47 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-26 20:40:47 +0200 |
| commit | a04fd1aa4f807e2f97632a46070306e1389264ed (patch) | |
| tree | fc2511add6defbbcb3f5285ef78fd0c34ccc5512 /crypto/userspace/cryptodev_cipher.c | |
| parent | 16ace6317db2c47b36b08b0addfe91356151c08d (diff) | |
| parent | 935be4945512eb37461a226c51ede5e8b05cbe24 (diff) | |
| download | kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.tar.gz kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.tar.xz kernel-crypto-a04fd1aa4f807e2f97632a46070306e1389264ed.zip | |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
crypto/userspace/ncr-data.c
crypto/userspace/ncr_int.h
examples/Makefile
examples/ncr.c
examples/pk.c
examples/speed.c
ncr-int.h
ncr_int.h
Diffstat (limited to 'crypto/userspace/cryptodev_cipher.c')
| -rw-r--r-- | crypto/userspace/cryptodev_cipher.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/userspace/cryptodev_cipher.c b/crypto/userspace/cryptodev_cipher.c index fa5aab28942..0dd0db77120 100644 --- a/crypto/userspace/cryptodev_cipher.c +++ b/crypto/userspace/cryptodev_cipher.c @@ -188,24 +188,24 @@ struct scatterlist sg, sg2; } -ssize_t cryptodev_cipher_encrypt( struct cipher_data* cdata, struct scatterlist *sg1, struct scatterlist *sg2, size_t len) +ssize_t cryptodev_cipher_encrypt( struct cipher_data* cdata, const struct scatterlist *sg1, struct scatterlist *sg2, size_t len) { int ret; INIT_COMPLETION(cdata->async.result->completion); - ablkcipher_request_set_crypt(cdata->async.request, sg1, sg2, + ablkcipher_request_set_crypt(cdata->async.request, (struct scatterlist*)sg1, sg2, len, cdata->async.iv); ret = crypto_ablkcipher_encrypt(cdata->async.request); return waitfor(cdata->async.result,ret); } -ssize_t cryptodev_cipher_decrypt( struct cipher_data* cdata, struct scatterlist *sg1, struct scatterlist *sg2, size_t len) +ssize_t cryptodev_cipher_decrypt( struct cipher_data* cdata, const struct scatterlist *sg1, struct scatterlist *sg2, size_t len) { int ret; INIT_COMPLETION(cdata->async.result->completion); - ablkcipher_request_set_crypt(cdata->async.request, sg1, sg2, + ablkcipher_request_set_crypt(cdata->async.request, (struct scatterlist*)sg1, sg2, len, cdata->async.iv); ret = crypto_ablkcipher_decrypt(cdata->async.request); |