8 files changed, 306 insertions, 14 deletions

diff --git a/include/crypto/aead.h b/include/crypto/aead.h
index 0edf949f6369..94b19be67574 100644
--- a/include/crypto/aead.h
+++ b/include/crypto/aead.h
@@ -75,9 +75,9 @@ static inline void aead_givcrypt_free(struct aead_givcrypt_request *req)
 
 static inline void aead_givcrypt_set_callback(
         struct aead_givcrypt_request *req, u32 flags,
-        crypto_completion_t complete, void *data)
+        crypto_completion_t compl, void *data)
 {
-        aead_request_set_callback(&req->areq, flags, complete, data);
+        aead_request_set_callback(&req->areq, flags, compl, data);
 }
 
 static inline void aead_givcrypt_set_crypt(struct aead_givcrypt_request *req,
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 016c2f110f63..623a59c1ff5a 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -410,4 +410,10 @@ static inline int crypto_memneq(const void *a, const void *b, size_t size)
         return __crypto_memneq(a, b, size) != 0UL ? 1 : 0;
 }
 
+static inline void crypto_yield(u32 flags)
+{
+        if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)
+                cond_resched();
+}
+
 #endif  /* _CRYPTO_ALGAPI_H */
diff --git a/include/crypto/des.h b/include/crypto/des.h
index 2971c6304ade..fc6274c6bb26 100644
--- a/include/crypto/des.h
+++ b/include/crypto/des.h
@@ -16,4 +16,7 @@
 
 extern unsigned long des_ekey(u32 *pe, const u8 *k);
 
+extern int __des3_ede_setkey(u32 *expkey, u32 *flags, const u8 *key,
+                             unsigned int keylen);
+
 #endif /* __CRYPTO_DES_H */
diff --git a/include/crypto/drbg.h b/include/crypto/drbg.h
new file mode 100644
index 000000000000..831d786976c5
--- /dev/null
+++ b/include/crypto/drbg.h
@@ -0,0 +1,290 @@
+/*
+ * DRBG based on NIST SP800-90A
+ *
+ * Copyright Stephan Mueller <smueller@chronox.de>, 2014
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, and the entire permission notice in its entirety,
+ *    including the disclaimer of warranties.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * ALTERNATIVELY, this product may be distributed under the terms of
+ * the GNU General Public License, in which case the provisions of the GPL are
+ * required INSTEAD OF the above restrictions.  (This clause is
+ * necessary due to a potential bad interaction between the GPL and
+ * the restrictions contained in a BSD-style copyright.)
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
+ * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ */
+
+#ifndef _DRBG_H
+#define _DRBG_H
+
+
+#include <linux/random.h>
+#include <linux/scatterlist.h>
+#include <crypto/hash.h>
+#include <linux/module.h>
+#include <linux/crypto.h>
+#include <linux/slab.h>
+#include <crypto/internal/rng.h>
+#include <crypto/rng.h>
+#include <linux/fips.h>
+#include <linux/spinlock.h>
+#include <linux/list.h>
+
+/*
+ * Concatenation Helper and string operation helper
+ *
+ * SP800-90A requires the concatenation of different data. To avoid copying
+ * buffers around or allocate additional memory, the following data structure
+ * is used to point to the original memory with its size. In addition, it
+ * is used to build a linked list. The linked list defines the concatenation
+ * of individual buffers. The order of memory block referenced in that
+ * linked list determines the order of concatenation.
+ */
+struct drbg_string {
+        const unsigned char *buf;
+        size_t len;
+        struct list_head list;
+};
+
+static inline void drbg_string_fill(struct drbg_string *string,
+                                    const unsigned char *buf, size_t len)
+{
+        string->buf = buf;
+        string->len = len;
+        INIT_LIST_HEAD(&string->list);
+}
+
+struct drbg_state;
+typedef uint32_t drbg_flag_t;
+
+struct drbg_core {
+        drbg_flag_t flags;      /* flags for the cipher */
+        __u8 statelen;          /* maximum state length */
+        /*
+         * maximum length of personalization string or additional input
+         * string -- exponent for base 2
+         */
+        __u8 max_addtllen;
+        /* maximum bits per RNG request -- exponent for base 2*/
+        __u8 max_bits;
+        /* maximum number of requests -- exponent for base 2 */
+        __u8 max_req;
+        __u8 blocklen_bytes;    /* block size of output in bytes */
+        char cra_name[CRYPTO_MAX_ALG_NAME]; /* mapping to kernel crypto API */
+         /* kernel crypto API backend cipher name */
+        char backend_cra_name[CRYPTO_MAX_ALG_NAME];
+};
+
+struct drbg_state_ops {
+        int (*update)(struct drbg_state *drbg, struct list_head *seed,
+                      int reseed);
+        int (*generate)(struct drbg_state *drbg,
+                        unsigned char *buf, unsigned int buflen,
+                        struct list_head *addtl);
+        int (*crypto_init)(struct drbg_state *drbg);
+        int (*crypto_fini)(struct drbg_state *drbg);
+
+};
+
+struct drbg_test_data {
+        struct drbg_string *testentropy; /* TEST PARAMETER: test entropy */
+};
+
+struct drbg_state {
+        spinlock_t drbg_lock;   /* lock around DRBG */
+        unsigned char *V;       /* internal state 10.1.1.1 1a) */
+        /* hash: static value 10.1.1.1 1b) hmac / ctr: key */
+        unsigned char *C;
+        /* Number of RNG requests since last reseed -- 10.1.1.1 1c) */
+        size_t reseed_ctr;
+         /* some memory the DRBG can use for its operation */
+        unsigned char *scratchpad;
+        void *priv_data;        /* Cipher handle */
+        bool seeded;            /* DRBG fully seeded? */
+        bool pr;                /* Prediction resistance enabled? */
+#ifdef CONFIG_CRYPTO_FIPS
+        bool fips_primed;       /* Continuous test primed? */
+        unsigned char *prev;    /* FIPS 140-2 continuous test value */
+#endif
+        const struct drbg_state_ops *d_ops;
+        const struct drbg_core *core;
+        struct drbg_test_data *test_data;
+};
+
+static inline __u8 drbg_statelen(struct drbg_state *drbg)
+{
+        if (drbg && drbg->core)
+                return drbg->core->statelen;
+        return 0;
+}
+
+static inline __u8 drbg_blocklen(struct drbg_state *drbg)
+{
+        if (drbg && drbg->core)
+                return drbg->core->blocklen_bytes;
+        return 0;
+}
+
+static inline __u8 drbg_keylen(struct drbg_state *drbg)
+{
+        if (drbg && drbg->core)
+                return (drbg->core->statelen - drbg->core->blocklen_bytes);
+        return 0;
+}
+
+static inline size_t drbg_max_request_bytes(struct drbg_state *drbg)
+{
+        /* max_bits is in bits, but buflen is in bytes */
+        return (1 << (drbg->core->max_bits - 3));
+}
+
+static inline size_t drbg_max_addtl(struct drbg_state *drbg)
+{
+        return (1UL<<(drbg->core->max_addtllen));
+}
+
+static inline size_t drbg_max_requests(struct drbg_state *drbg)
+{
+        return (1UL<<(drbg->core->max_req));
+}
+
+/*
+ * kernel crypto API input data structure for DRBG generate in case dlen
+ * is set to 0
+ */
+struct drbg_gen {
+        unsigned char *outbuf;  /* output buffer for random numbers */
+        unsigned int outlen;    /* size of output buffer */
+        struct drbg_string *addtl;      /* additional information string */
+        struct drbg_test_data *test_data;       /* test data */
+};
+
+/*
+ * This is a wrapper to the kernel crypto API function of
+ * crypto_rng_get_bytes() to allow the caller to provide additional data.
+ *
+ * @drng DRBG handle -- see crypto_rng_get_bytes
+ * @outbuf output buffer -- see crypto_rng_get_bytes
+ * @outlen length of output buffer -- see crypto_rng_get_bytes
+ * @addtl_input additional information string input buffer
+ * @addtllen length of additional information string buffer
+ *
+ * return
+ *      see crypto_rng_get_bytes
+ */
+static inline int crypto_drbg_get_bytes_addtl(struct crypto_rng *drng,
+                        unsigned char *outbuf, unsigned int outlen,
+                        struct drbg_string *addtl)
+{
+        int ret;
+        struct drbg_gen genbuf;
+        genbuf.outbuf = outbuf;
+        genbuf.outlen = outlen;
+        genbuf.addtl = addtl;
+        genbuf.test_data = NULL;
+        ret = crypto_rng_get_bytes(drng, (u8 *)&genbuf, 0);
+        return ret;
+}
+
+/*
+ * TEST code
+ *
+ * This is a wrapper to the kernel crypto API function of
+ * crypto_rng_get_bytes() to allow the caller to provide additional data and
+ * allow furnishing of test_data
+ *
+ * @drng DRBG handle -- see crypto_rng_get_bytes
+ * @outbuf output buffer -- see crypto_rng_get_bytes
+ * @outlen length of output buffer -- see crypto_rng_get_bytes
+ * @addtl_input additional information string input buffer
+ * @addtllen length of additional information string buffer
+ * @test_data filled test data
+ *
+ * return
+ *      see crypto_rng_get_bytes
+ */
+static inline int crypto_drbg_get_bytes_addtl_test(struct crypto_rng *drng,
+                        unsigned char *outbuf, unsigned int outlen,
+                        struct drbg_string *addtl,
+                        struct drbg_test_data *test_data)
+{
+        int ret;
+        struct drbg_gen genbuf;
+        genbuf.outbuf = outbuf;
+        genbuf.outlen = outlen;
+        genbuf.addtl = addtl;
+        genbuf.test_data = test_data;
+        ret = crypto_rng_get_bytes(drng, (u8 *)&genbuf, 0);
+        return ret;
+}
+
+/*
+ * TEST code
+ *
+ * This is a wrapper to the kernel crypto API function of
+ * crypto_rng_reset() to allow the caller to provide test_data
+ *
+ * @drng DRBG handle -- see crypto_rng_reset
+ * @pers personalization string input buffer
+ * @perslen length of additional information string buffer
+ * @test_data filled test data
+ *
+ * return
+ *      see crypto_rng_reset
+ */
+static inline int crypto_drbg_reset_test(struct crypto_rng *drng,
+                                         struct drbg_string *pers,
+                                         struct drbg_test_data *test_data)
+{
+        int ret;
+        struct drbg_gen genbuf;
+        genbuf.outbuf = NULL;
+        genbuf.outlen = 0;
+        genbuf.addtl = pers;
+        genbuf.test_data = test_data;
+        ret = crypto_rng_reset(drng, (u8 *)&genbuf, 0);
+        return ret;
+}
+
+/* DRBG type flags */
+#define DRBG_CTR        ((drbg_flag_t)1<<0)
+#define DRBG_HMAC       ((drbg_flag_t)1<<1)
+#define DRBG_HASH       ((drbg_flag_t)1<<2)
+#define DRBG_TYPE_MASK  (DRBG_CTR | DRBG_HMAC | DRBG_HASH)
+/* DRBG strength flags */
+#define DRBG_STRENGTH128        ((drbg_flag_t)1<<3)
+#define DRBG_STRENGTH192        ((drbg_flag_t)1<<4)
+#define DRBG_STRENGTH256        ((drbg_flag_t)1<<5)
+#define DRBG_STRENGTH_MASK      (DRBG_STRENGTH128 | DRBG_STRENGTH192 | \
+                                 DRBG_STRENGTH256)
+
+enum drbg_prefixes {
+        DRBG_PREFIX0 = 0x00,
+        DRBG_PREFIX1,
+        DRBG_PREFIX2,
+        DRBG_PREFIX3
+};
+
+#endif /* _DRBG_H */
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index 26cb1eb16f4c..a39195539601 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -238,10 +238,10 @@ static inline struct ahash_request *ahash_request_cast(
 
 static inline void ahash_request_set_callback(struct ahash_request *req,
                                               u32 flags,
-                                              crypto_completion_t complete,
+                                              crypto_completion_t compl,
                                               void *data)
 {
-        req->base.complete = complete;
+        req->base.complete = compl;
         req->base.data = data;
         req->base.flags = flags;
 }
diff --git a/include/crypto/internal/skcipher.h b/include/crypto/internal/skcipher.h
index 06e8b32d541c..b3a46c515d1b 100644
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
@@ -81,8 +81,7 @@ static inline int skcipher_enqueue_givcrypt(
 static inline struct skcipher_givcrypt_request *skcipher_dequeue_givcrypt(
         struct crypto_queue *queue)
 {
-        return __crypto_dequeue_request(
-                queue, offsetof(struct skcipher_givcrypt_request, creq.base));
+        return skcipher_givcrypt_cast(crypto_dequeue_request(queue));
 }
 
 static inline void *skcipher_givcrypt_reqctx(
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h
index 6a626a507b8c..7ef512f8631c 100644
--- a/include/crypto/scatterwalk.h
+++ b/include/crypto/scatterwalk.h
@@ -25,12 +25,6 @@
 #include <linux/scatterlist.h>
 #include <linux/sched.h>
 
-static inline void crypto_yield(u32 flags)
-{
-        if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)
-                cond_resched();
-}
-
 static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num,
                                         struct scatterlist *sg2)
 {
diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h
index 25fd6126522d..07d245f073d1 100644
--- a/include/crypto/skcipher.h
+++ b/include/crypto/skcipher.h
@@ -86,9 +86,9 @@ static inline void skcipher_givcrypt_free(struct skcipher_givcrypt_request *req)
 
 static inline void skcipher_givcrypt_set_callback(
         struct skcipher_givcrypt_request *req, u32 flags,
-        crypto_completion_t complete, void *data)
+        crypto_completion_t compl, void *data)
 {
-        ablkcipher_request_set_callback(&req->creq, flags, complete, data);
+        ablkcipher_request_set_callback(&req->creq, flags, compl, data);
 }
 
 static inline void skcipher_givcrypt_set_crypt(