Merge tag 'linux-watchdog-5.5-rc1' of git://www.linux-watchdog.org/linux-watchdog

[linux.git] / include / crypto / algapi.h

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index e5bd302f2c49e3a9012230e668ffee42fe754cff..5cd846defdd6e5b3998e0e8efa2d8fc9d2e7d6fb 100644 (file)
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -85,56 +85,6 @@ struct scatter_walk {
        unsigned int offset;
 };
 
-struct blkcipher_walk {
-       union {
-               struct {
-                       struct page *page;
-                       unsigned long offset;
-               } phys;
-
-               struct {
-                       u8 *page;
-                       u8 *addr;
-               } virt;
-       } src, dst;
-
-       struct scatter_walk in;
-       unsigned int nbytes;
-
-       struct scatter_walk out;
-       unsigned int total;
-
-       void *page;
-       u8 *buffer;
-       u8 *iv;
-       unsigned int ivsize;
-
-       int flags;
-       unsigned int walk_blocksize;
-       unsigned int cipher_blocksize;
-       unsigned int alignmask;
-};
-
-struct ablkcipher_walk {
-       struct {
-               struct page *page;
-               unsigned int offset;
-       } src, dst;
-
-       struct scatter_walk     in;
-       unsigned int            nbytes;
-       struct scatter_walk     out;
-       unsigned int            total;
-       struct list_head        buffers;
-       u8                      *iv_buffer;
-       u8                      *iv;
-       int                     flags;
-       unsigned int            blocksize;
-};
-
-extern const struct crypto_type crypto_ablkcipher_type;
-extern const struct crypto_type crypto_blkcipher_type;
-
 void crypto_mod_put(struct crypto_alg *alg);
 
 int crypto_register_template(struct crypto_template *tmpl);
@@ -233,26 +183,6 @@ static inline void crypto_xor_cpy(u8 *dst, const u8 *src1, const u8 *src2,
        }
 }
 
-int blkcipher_walk_done(struct blkcipher_desc *desc,
-                       struct blkcipher_walk *walk, int err);
-int blkcipher_walk_virt(struct blkcipher_desc *desc,
-                       struct blkcipher_walk *walk);
-int blkcipher_walk_phys(struct blkcipher_desc *desc,
-                       struct blkcipher_walk *walk);
-int blkcipher_walk_virt_block(struct blkcipher_desc *desc,
-                             struct blkcipher_walk *walk,
-                             unsigned int blocksize);
-int blkcipher_aead_walk_virt_block(struct blkcipher_desc *desc,
-                                  struct blkcipher_walk *walk,
-                                  struct crypto_aead *tfm,
-                                  unsigned int blocksize);
-
-int ablkcipher_walk_done(struct ablkcipher_request *req,
-                        struct ablkcipher_walk *walk, int err);
-int ablkcipher_walk_phys(struct ablkcipher_request *req,
-                        struct ablkcipher_walk *walk);
-void __ablkcipher_walk_complete(struct ablkcipher_walk *walk);
-
 static inline void *crypto_tfm_ctx_aligned(struct crypto_tfm *tfm)
 {
        return PTR_ALIGN(crypto_tfm_ctx(tfm),
@@ -270,41 +200,6 @@ static inline void *crypto_instance_ctx(struct crypto_instance *inst)
        return inst->__ctx;
 }
 
-static inline struct ablkcipher_alg *crypto_ablkcipher_alg(
-       struct crypto_ablkcipher *tfm)
-{
-       return &crypto_ablkcipher_tfm(tfm)->__crt_alg->cra_ablkcipher;
-}
-
-static inline void *crypto_ablkcipher_ctx(struct crypto_ablkcipher *tfm)
-{
-       return crypto_tfm_ctx(&tfm->base);
-}
-
-static inline void *crypto_ablkcipher_ctx_aligned(struct crypto_ablkcipher *tfm)
-{
-       return crypto_tfm_ctx_aligned(&tfm->base);
-}
-
-static inline struct crypto_blkcipher *crypto_spawn_blkcipher(
-       struct crypto_spawn *spawn)
-{
-       u32 type = CRYPTO_ALG_TYPE_BLKCIPHER;
-       u32 mask = CRYPTO_ALG_TYPE_MASK;
-
-       return __crypto_blkcipher_cast(crypto_spawn_tfm(spawn, type, mask));
-}
-
-static inline void *crypto_blkcipher_ctx(struct crypto_blkcipher *tfm)
-{
-       return crypto_tfm_ctx(&tfm->base);
-}
-
-static inline void *crypto_blkcipher_ctx_aligned(struct crypto_blkcipher *tfm)
-{
-       return crypto_tfm_ctx_aligned(&tfm->base);
-}
-
 static inline struct crypto_cipher *crypto_spawn_cipher(
        struct crypto_spawn *spawn)
 {
@@ -319,33 +214,6 @@ static inline struct cipher_alg *crypto_cipher_alg(struct crypto_cipher *tfm)
        return &crypto_cipher_tfm(tfm)->__crt_alg->cra_cipher;
 }
 
-static inline void blkcipher_walk_init(struct blkcipher_walk *walk,
-                                      struct scatterlist *dst,
-                                      struct scatterlist *src,
-                                      unsigned int nbytes)
-{
-       walk->in.sg = src;
-       walk->out.sg = dst;
-       walk->total = nbytes;
-}
-
-static inline void ablkcipher_walk_init(struct ablkcipher_walk *walk,
-                                       struct scatterlist *dst,
-                                       struct scatterlist *src,
-                                       unsigned int nbytes)
-{
-       walk->in.sg = src;
-       walk->out.sg = dst;
-       walk->total = nbytes;
-       INIT_LIST_HEAD(&walk->buffers);
-}
-
-static inline void ablkcipher_walk_complete(struct ablkcipher_walk *walk)
-{
-       if (unlikely(!list_empty(&walk->buffers)))
-               __ablkcipher_walk_complete(walk);
-}
-
 static inline struct crypto_async_request *crypto_get_backlog(
        struct crypto_queue *queue)
 {
@@ -353,23 +221,6 @@ static inline struct crypto_async_request *crypto_get_backlog(
               container_of(queue->backlog, struct crypto_async_request, list);
 }
 
-static inline int ablkcipher_enqueue_request(struct crypto_queue *queue,
-                                            struct ablkcipher_request *request)
-{
-       return crypto_enqueue_request(queue, &request->base);
-}
-
-static inline struct ablkcipher_request *ablkcipher_dequeue_request(
-       struct crypto_queue *queue)
-{
-       return ablkcipher_request_cast(crypto_dequeue_request(queue));
-}
-
-static inline void *ablkcipher_request_ctx(struct ablkcipher_request *req)
-{
-       return req->__ctx;
-}
-
 static inline struct crypto_alg *crypto_get_attr_alg(struct rtattr **tb,
                                                     u32 type, u32 mask)
 {