[CRYPTO] skcipher: Add top-level givencrypt/givdecrypt calls

This patch finally makes the givencrypt/givdecrypt operations available
to users by adding crypto_skcipher_givencrypt and crypto_skcipher_givdecrypt.
A suite of helpers to allocate and fill in the request is also available.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h
index c283fab..25fd612 100644 (file)
--- a/include/crypto/skcipher.h
+++ b/include/crypto/skcipher.h
@@ -14,6 +14,8 @@
 #define _CRYPTO_SKCIPHER_H
 
 #include <linux/crypto.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
 
 /**
  *     struct skcipher_givcrypt_request - Crypto request with IV generation
@@ -34,5 +36,75 @@ static inline struct crypto_ablkcipher *skcipher_givcrypt_reqtfm(
        return crypto_ablkcipher_reqtfm(&req->creq);
 }
 
+static inline int crypto_skcipher_givencrypt(
+       struct skcipher_givcrypt_request *req)
+{
+       struct ablkcipher_tfm *crt =
+               crypto_ablkcipher_crt(skcipher_givcrypt_reqtfm(req));
+       return crt->givencrypt(req);
+};
+
+static inline int crypto_skcipher_givdecrypt(
+       struct skcipher_givcrypt_request *req)
+{
+       struct ablkcipher_tfm *crt =
+               crypto_ablkcipher_crt(skcipher_givcrypt_reqtfm(req));
+       return crt->givdecrypt(req);
+};
+
+static inline void skcipher_givcrypt_set_tfm(
+       struct skcipher_givcrypt_request *req, struct crypto_ablkcipher *tfm)
+{
+       req->creq.base.tfm = crypto_ablkcipher_tfm(tfm);
+}
+
+static inline struct skcipher_givcrypt_request *skcipher_givcrypt_cast(
+       struct crypto_async_request *req)
+{
+       return container_of(ablkcipher_request_cast(req),
+                           struct skcipher_givcrypt_request, creq);
+}
+
+static inline struct skcipher_givcrypt_request *skcipher_givcrypt_alloc(
+       struct crypto_ablkcipher *tfm, gfp_t gfp)
+{
+       struct skcipher_givcrypt_request *req;
+
+       req = kmalloc(sizeof(struct skcipher_givcrypt_request) +
+                     crypto_ablkcipher_reqsize(tfm), gfp);
+
+       if (likely(req))
+               skcipher_givcrypt_set_tfm(req, tfm);
+
+       return req;
+}
+
+static inline void skcipher_givcrypt_free(struct skcipher_givcrypt_request *req)
+{
+       kfree(req);
+}
+
+static inline void skcipher_givcrypt_set_callback(
+       struct skcipher_givcrypt_request *req, u32 flags,
+       crypto_completion_t complete, void *data)
+{
+       ablkcipher_request_set_callback(&req->creq, flags, complete, data);
+}
+
+static inline void skcipher_givcrypt_set_crypt(
+       struct skcipher_givcrypt_request *req,
+       struct scatterlist *src, struct scatterlist *dst,
+       unsigned int nbytes, void *iv)
+{
+       ablkcipher_request_set_crypt(&req->creq, src, dst, nbytes, iv);
+}
+
+static inline void skcipher_givcrypt_set_giv(
+       struct skcipher_givcrypt_request *req, u8 *giv, u64 seq)
+{
+       req->giv = giv;
+       req->seq = seq;
+}
+
 #endif /* _CRYPTO_SKCIPHER_H */