summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-11-30 12:53:12 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2016-11-30 12:53:12 +0100
commit479d014de544a0916037fcf77e873f815545cd5e (patch)
tree6752a8184e2f2696c31ab141576e9902410c6c75 /include
parentcrypto: arm/aes - Select SIMD in Kconfig (diff)
parentcrypto: rsa - Add Makefile dependencies to fix parallel builds (diff)
downloadlinux-479d014de544a0916037fcf77e873f815545cd5e.tar.xz
linux-479d014de544a0916037fcf77e873f815545cd5e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in chelsio chcr fix.
Diffstat (limited to 'include')
-rw-r--r--include/crypto/drbg.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/crypto/drbg.h b/include/crypto/drbg.h
index 61580b19f9f6..22f884c97387 100644
--- a/include/crypto/drbg.h
+++ b/include/crypto/drbg.h
@@ -124,6 +124,8 @@ struct drbg_state {
struct skcipher_request *ctr_req; /* CTR mode request handle */
__u8 *ctr_null_value_buf; /* CTR mode unaligned buffer */
__u8 *ctr_null_value; /* CTR mode aligned zero buf */
+ __u8 *outscratchpadbuf; /* CTR mode output scratchpad */
+ __u8 *outscratchpad; /* CTR mode aligned outbuf */
struct completion ctr_completion; /* CTR mode async handler */
int ctr_async_err; /* CTR mode async error */