crypto: aead - Remove old AEAD interfaces

[mirror_ubuntu-bionic-kernel.git] / include / linux / crypto.h

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 81ef938b0a8e9d34342ddbf8459a7a8b30b489d1..7f4aee9e1f9118397b46ecce06636698b5ddc63e 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -142,13 +142,10 @@
 struct scatterlist;
 struct crypto_ablkcipher;
 struct crypto_async_request;
-struct crypto_aead;
 struct crypto_blkcipher;
 struct crypto_hash;
 struct crypto_tfm;
 struct crypto_type;
-struct aead_request;
-struct aead_givcrypt_request;
 struct skcipher_givcrypt_request;
 
 typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err);
@@ -274,47 +271,6 @@ struct ablkcipher_alg {
        unsigned int ivsize;
 };
 
-/**
- * struct old_aead_alg - AEAD cipher definition
- * @maxauthsize: Set the maximum authentication tag size supported by the
- *              transformation. A transformation may support smaller tag sizes.
- *              As the authentication tag is a message digest to ensure the
- *              integrity of the encrypted data, a consumer typically wants the
- *              largest authentication tag possible as defined by this
- *              variable.
- * @setauthsize: Set authentication size for the AEAD transformation. This
- *              function is used to specify the consumer requested size of the
- *              authentication tag to be either generated by the transformation
- *              during encryption or the size of the authentication tag to be
- *              supplied during the decryption operation. This function is also
- *              responsible for checking the authentication tag size for
- *              validity.
- * @setkey: see struct ablkcipher_alg
- * @encrypt: see struct ablkcipher_alg
- * @decrypt: see struct ablkcipher_alg
- * @givencrypt: see struct ablkcipher_alg
- * @givdecrypt: see struct ablkcipher_alg
- * @geniv: see struct ablkcipher_alg
- * @ivsize: see struct ablkcipher_alg
- *
- * All fields except @givencrypt , @givdecrypt , @geniv and @ivsize are
- * mandatory and must be filled.
- */
-struct old_aead_alg {
-       int (*setkey)(struct crypto_aead *tfm, const u8 *key,
-                     unsigned int keylen);
-       int (*setauthsize)(struct crypto_aead *tfm, unsigned int authsize);
-       int (*encrypt)(struct aead_request *req);
-       int (*decrypt)(struct aead_request *req);
-       int (*givencrypt)(struct aead_givcrypt_request *req);
-       int (*givdecrypt)(struct aead_givcrypt_request *req);
-
-       const char *geniv;
-
-       unsigned int ivsize;
-       unsigned int maxauthsize;
-};
-
 /**
  * struct blkcipher_alg - synchronous block cipher definition
  * @min_keysize: see struct ablkcipher_alg
@@ -409,7 +365,6 @@ struct compress_alg {
 
 
 #define cra_ablkcipher cra_u.ablkcipher
-#define cra_aead       cra_u.aead
 #define cra_blkcipher  cra_u.blkcipher
 #define cra_cipher     cra_u.cipher
 #define cra_compress   cra_u.compress
@@ -460,7 +415,7 @@ struct compress_alg {
  *           struct crypto_type, which implements callbacks common for all
  *           transformation types. There are multiple options:
  *           &crypto_blkcipher_type, &crypto_ablkcipher_type,
- *           &crypto_ahash_type, &crypto_aead_type, &crypto_rng_type.
+ *           &crypto_ahash_type, &crypto_rng_type.
  *           This field might be empty. In that case, there are no common
  *           callbacks. This is the case for: cipher, compress, shash.
  * @cra_u: Callbacks implementing the transformation. This is a union of
@@ -508,7 +463,6 @@ struct crypto_alg {
 
        union {
                struct ablkcipher_alg ablkcipher;
-               struct old_aead_alg aead;
                struct blkcipher_alg blkcipher;
                struct cipher_alg cipher;
                struct compress_alg compress;