Merge git://www.linux-watchdog.org/linux-watchdog

[cascardo/linux.git] / include / crypto / drbg.h

diff --git a/include/crypto/drbg.h b/include/crypto/drbg.h
index d961b2b..61580b1 100644 (file)
--- a/include/crypto/drbg.h
+++ b/include/crypto/drbg.h
@@ -43,6 +43,7 @@
 #include <linux/random.h>
 #include <linux/scatterlist.h>
 #include <crypto/hash.h>
+#include <crypto/skcipher.h>
 #include <linux/module.h>
 #include <linux/crypto.h>
 #include <linux/slab.h>
@@ -107,14 +108,25 @@ struct drbg_test_data {
 struct drbg_state {
        struct mutex drbg_mutex;        /* lock around DRBG */
        unsigned char *V;       /* internal state 10.1.1.1 1a) */
+       unsigned char *Vbuf;
        /* hash: static value 10.1.1.1 1b) hmac / ctr: key */
        unsigned char *C;
+       unsigned char *Cbuf;
        /* Number of RNG requests since last reseed -- 10.1.1.1 1c) */
        size_t reseed_ctr;
        size_t reseed_threshold;
         /* some memory the DRBG can use for its operation */
        unsigned char *scratchpad;
+       unsigned char *scratchpadbuf;
        void *priv_data;        /* Cipher handle */
+
+       struct crypto_skcipher *ctr_handle;     /* CTR mode cipher handle */
+       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 */
+       struct completion ctr_completion;       /* CTR mode async handler */
+       int ctr_async_err;                      /* CTR mode async error */
+
        bool seeded;            /* DRBG fully seeded? */
        bool pr;                /* Prediction resistance enabled? */
        struct work_struct seed_work;   /* asynchronous seeding support */