diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:20:55 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:20:55 +0900 |
| commit | 2fc3750b483ab74709f99072ac6ccc5ea9f0ae13 (patch) | |
| tree | d7d6f9132b0086ffdf0b1bb544b9f527ad98199b | |
| parent | 707bbd9bf2d2a811bddcaa582b998d110fc371f4 (diff) | |
| parent | acdb0b3ef0b5f05a8b4f14cf973532ea68da93a5 (diff) | |
| download | linux-crypto-2fc3750b483ab74709f99072ac6ccc5ea9f0ae13.tar.gz linux-crypto-2fc3750b483ab74709f99072ac6ccc5ea9f0ae13.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
| -rw-r--r-- | crypto/rsa-pkcs1pad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/rsa-pkcs1pad.c b/crypto/rsa-pkcs1pad.c index ead8dc0d..8ba42663 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, |