These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / crypto / internal / aead.h

diff --git a/kernel/include/crypto/internal/aead.h b/kernel/include/crypto/internal/aead.h
index 2eba340..5554cdd 100644 (file)
--- a/kernel/include/crypto/internal/aead.h
+++ b/kernel/include/crypto/internal/aead.h
@@ -1,7 +1,7 @@
 /*
  * AEAD: Authenticated Encryption with Associated Data
  * 
- * Copyright (c) 2007 Herbert Xu <herbert@gondor.apana.org.au>
+ * Copyright (c) 2007-2015 Herbert Xu <herbert@gondor.apana.org.au>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -15,15 +15,70 @@
 
 #include <crypto/aead.h>
 #include <crypto/algapi.h>
+#include <linux/stddef.h>
 #include <linux/types.h>
 
 struct rtattr;
 
+struct aead_instance {
+       void (*free)(struct aead_instance *inst);
+       union {
+               struct {
+                       char head[offsetof(struct aead_alg, base)];
+                       struct crypto_instance base;
+               } s;
+               struct aead_alg alg;
+       };
+};
+
 struct crypto_aead_spawn {
        struct crypto_spawn base;
 };
 
-extern const struct crypto_type crypto_nivaead_type;
+struct aead_queue {
+       struct crypto_queue base;
+};
+
+static inline void *crypto_aead_ctx(struct crypto_aead *tfm)
+{
+       return crypto_tfm_ctx(&tfm->base);
+}
+
+static inline struct crypto_instance *aead_crypto_instance(
+       struct aead_instance *inst)
+{
+       return container_of(&inst->alg.base, struct crypto_instance, alg);
+}
+
+static inline struct aead_instance *aead_instance(struct crypto_instance *inst)
+{
+       return container_of(&inst->alg, struct aead_instance, alg.base);
+}
+
+static inline struct aead_instance *aead_alg_instance(struct crypto_aead *aead)
+{
+       return aead_instance(crypto_tfm_alg_instance(&aead->base));
+}
+
+static inline void *aead_instance_ctx(struct aead_instance *inst)
+{
+       return crypto_instance_ctx(aead_crypto_instance(inst));
+}
+
+static inline void *aead_request_ctx(struct aead_request *req)
+{
+       return req->__ctx;
+}
+
+static inline void aead_request_complete(struct aead_request *req, int err)
+{
+       req->base.complete(&req->base, err);
+}
+
+static inline u32 aead_request_flags(struct aead_request *req)
+{
+       return req->base.flags;
+}
 
 static inline void crypto_set_aead_spawn(
        struct crypto_aead_spawn *spawn, struct crypto_instance *inst)
@@ -31,8 +86,6 @@ static inline void crypto_set_aead_spawn(
        crypto_set_spawn(&spawn->base, inst);
 }
 
-struct crypto_alg *crypto_lookup_aead(const char *name, u32 type, u32 mask);
-
 int crypto_grab_aead(struct crypto_aead_spawn *spawn, const char *name,
                     u32 type, u32 mask);
 
@@ -41,42 +94,71 @@ static inline void crypto_drop_aead(struct crypto_aead_spawn *spawn)
        crypto_drop_spawn(&spawn->base);
 }
 
-static inline struct crypto_alg *crypto_aead_spawn_alg(
+static inline struct aead_alg *crypto_spawn_aead_alg(
        struct crypto_aead_spawn *spawn)
 {
-       return spawn->base.alg;
+       return container_of(spawn->base.alg, struct aead_alg, base);
 }
 
 static inline struct crypto_aead *crypto_spawn_aead(
        struct crypto_aead_spawn *spawn)
 {
-       return __crypto_aead_cast(
-               crypto_spawn_tfm(&spawn->base, CRYPTO_ALG_TYPE_AEAD,
-                                CRYPTO_ALG_TYPE_MASK));
+       return crypto_spawn_tfm2(&spawn->base);
+}
+
+static inline void crypto_aead_set_reqsize(struct crypto_aead *aead,
+                                          unsigned int reqsize)
+{
+       aead->reqsize = reqsize;
+}
+
+static inline unsigned int crypto_aead_alg_maxauthsize(struct aead_alg *alg)
+{
+       return alg->maxauthsize;
 }
 
-struct crypto_instance *aead_geniv_alloc(struct crypto_template *tmpl,
-                                        struct rtattr **tb, u32 type,
-                                        u32 mask);
-void aead_geniv_free(struct crypto_instance *inst);
-int aead_geniv_init(struct crypto_tfm *tfm);
-void aead_geniv_exit(struct crypto_tfm *tfm);
+static inline unsigned int crypto_aead_maxauthsize(struct crypto_aead *aead)
+{
+       return crypto_aead_alg_maxauthsize(crypto_aead_alg(aead));
+}
 
-static inline struct crypto_aead *aead_geniv_base(struct crypto_aead *geniv)
+static inline void aead_init_queue(struct aead_queue *queue,
+                                  unsigned int max_qlen)
 {
-       return crypto_aead_crt(geniv)->base;
+       crypto_init_queue(&queue->base, max_qlen);
 }
 
-static inline void *aead_givcrypt_reqctx(struct aead_givcrypt_request *req)
+static inline int aead_enqueue_request(struct aead_queue *queue,
+                                      struct aead_request *request)
 {
-       return aead_request_ctx(&req->areq);
+       return crypto_enqueue_request(&queue->base, &request->base);
 }
 
-static inline void aead_givcrypt_complete(struct aead_givcrypt_request *req,
-                                         int err)
+static inline struct aead_request *aead_dequeue_request(
+       struct aead_queue *queue)
 {
-       aead_request_complete(&req->areq, err);
+       struct crypto_async_request *req;
+
+       req = crypto_dequeue_request(&queue->base);
+
+       return req ? container_of(req, struct aead_request, base) : NULL;
 }
 
+static inline struct aead_request *aead_get_backlog(struct aead_queue *queue)
+{
+       struct crypto_async_request *req;
+
+       req = crypto_get_backlog(&queue->base);
+
+       return req ? container_of(req, struct aead_request, base) : NULL;
+}
+
+int crypto_register_aead(struct aead_alg *alg);
+void crypto_unregister_aead(struct aead_alg *alg);
+int crypto_register_aeads(struct aead_alg *algs, int count);
+void crypto_unregister_aeads(struct aead_alg *algs, int count);
+int aead_register_instance(struct crypto_template *tmpl,
+                          struct aead_instance *inst);
+
 #endif /* _CRYPTO_INTERNAL_AEAD_H */