Skip to content

Commit

Permalink
crypto: algif_aead - Temporarily disable all AEAD algorithms
Browse files Browse the repository at this point in the history
As the AEAD conversion is still ongoing, we do not yet wish to
export legacy AEAD implementations to user-space, as their calling
convention will change.

This patch actually disables all AEAD algorithms because some of
them (e.g., cryptd) will need to be modified to propagate this flag.

Subsequent patches will reenable them on an individual basis.

Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
herbertx committed Jun 22, 2015
1 parent 15539de commit 3e90950
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion crypto/algif_aead.c
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,8 @@ static struct proto_ops algif_aead_ops = {

static void *aead_bind(const char *name, u32 type, u32 mask)
{
return crypto_alloc_aead(name, type, mask);
return crypto_alloc_aead(name, type | CRYPTO_ALG_AEAD_NEW,
mask | CRYPTO_ALG_AEAD_NEW);
}

static void aead_release(void *private)
Expand Down
6 changes: 6 additions & 0 deletions include/linux/crypto.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@
*/
#define CRYPTO_ALG_INTERNAL 0x00002000

/*
* Temporary flag used to prevent legacy AEAD implementations from
* being used by user-space.
*/
#define CRYPTO_ALG_AEAD_NEW 0x00004000

/*
* Transform masks and values (for crt_flags).
*/
Expand Down

0 comments on commit 3e90950

Please sign in to comment.