summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-23 12:20:55 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-23 12:20:55 +0900
commit48d4ca5639507b8c37e3bd5711e70aedb05dee2c (patch)
tree39b0c08c88be9874b0e01d1d3794b74cc08e51c0 /crypto
parent897473fc040fd69e9a4a6da2ac62a4724a4a8619 (diff)
parent87dcdebd6beb54f183ae874664ba47bf071ebf95 (diff)
downloadlinux-stable-48d4ca5639507b8c37e3bd5711e70aedb05dee2c.tar.gz
linux-stable-48d4ca5639507b8c37e3bd5711e70aedb05dee2c.tar.bz2
linux-stable-48d4ca5639507b8c37e3bd5711e70aedb05dee2c.zip
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes a sporadic build failure in the qat driver as well as a memory corruption bug in rsa-pkcs1pad" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: rsa-pkcs1pad - fix rsa-pkcs1pad request struct crypto: qat - make qat_asym_algs.o depend on asn1 headers
Diffstat (limited to 'crypto')
-rw-r--r--crypto/rsa-pkcs1pad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/rsa-pkcs1pad.c b/crypto/rsa-pkcs1pad.c
index ead8dc0d084e..8ba426635b1b 100644
--- a/crypto/rsa-pkcs1pad.c
+++ b/crypto/rsa-pkcs1pad.c
@@ -102,10 +102,10 @@ struct pkcs1pad_inst_ctx {
};
struct pkcs1pad_request {
- struct akcipher_request child_req;
-
struct scatterlist in_sg[3], out_sg[2];
uint8_t *in_buf, *out_buf;
+
+ struct akcipher_request child_req;
};
static int pkcs1pad_set_pub_key(struct crypto_akcipher *tfm, const void *key,