diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-11-30 19:53:12 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-11-30 19:53:12 +0800 |
| commit | 479d014de544a0916037fcf77e873f815545cd5e (patch) | |
| tree | 6752a8184e2f2696c31ab141576e9902410c6c75 /include/crypto | |
| parent | 585b5fa63da92b2d46d5c1735a5c46e9a1486bbe (diff) | |
| parent | 57891633eeef60e732e045731cf20e50ee80acb4 (diff) | |
| download | linux-479d014de544a0916037fcf77e873f815545cd5e.tar.gz linux-479d014de544a0916037fcf77e873f815545cd5e.tar.bz2 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/crypto')
| -rw-r--r-- | include/crypto/drbg.h | 2 |
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 */ |